From 1f8851ec0eba58a73e63287322f2c94b8182d4fc Mon Sep 17 00:00:00 2001 From: jerevoss Date: Wed, 7 Jun 2023 17:11:37 -0700 Subject: [PATCH 1/3] spelling --- CHANGELOG.md | 2 ++ .../azure/monitor/opentelemetry/_configure.py | 2 +- .../azure/monitor/opentelemetry/autoinstrumentation/_distro.py | 2 +- azure-monitor-opentelemetry/samples/tracing/manual.py | 2 +- .../tests/autoinstrumentation/test_distro.py | 2 +- azure-monitor-opentelemetry/tests/test_constants.py | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13ffca69..8455cc87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Update samples ([#281](https://github.com/microsoft/ApplicationInsights-Python/pull/281)) +- Fixed spelling + ([#291](https://github.com/microsoft/ApplicationInsights-Python/pull/291)) ## [1.0.0b12](https://github.com/microsoft/ApplicationInsights-Python/releases/tag/v1.0.0b12) - 2023-05-05 diff --git a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py index 47873cbc..0073b427 100644 --- a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py +++ b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py @@ -145,7 +145,7 @@ def _setup_instrumentations(): instrumentor().instrument(skip_dep_check=True) except Exception as ex: _logger.warning( - "Exception occured when instrumenting: %s.", + "Exception occurred when instrumenting: %s.", lib_name, exc_info=ex, ) diff --git a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/autoinstrumentation/_distro.py b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/autoinstrumentation/_distro.py index 1ca3adf5..d9341050 100644 --- a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/autoinstrumentation/_distro.py +++ b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/autoinstrumentation/_distro.py @@ -34,7 +34,7 @@ def _configure(self, **kwargs) -> None: _configure_auto_instrumentation() except Exception as ex: _logger.exception( - ("Error occured auto-instrumenting AzureMonitorDistro") + ("Error occurred auto-instrumenting AzureMonitorDistro") ) raise ex diff --git a/azure-monitor-opentelemetry/samples/tracing/manual.py b/azure-monitor-opentelemetry/samples/tracing/manual.py index 7bbf1e50..feaa15f4 100644 --- a/azure-monitor-opentelemetry/samples/tracing/manual.py +++ b/azure-monitor-opentelemetry/samples/tracing/manual.py @@ -11,7 +11,7 @@ engine = create_engine("sqlite:///:memory:") # SQLAlchemy instrumentation is not officially supported by this package -# However, you can use the OpenTelemetry instument method manually in +# However, you can use the OpenTelemetry instrument method manually in # conjunction with configure_azure_monitor SQLAlchemyInstrumentor().instrument( engine=engine, diff --git a/azure-monitor-opentelemetry/tests/autoinstrumentation/test_distro.py b/azure-monitor-opentelemetry/tests/autoinstrumentation/test_distro.py index aae4653b..874ca922 100644 --- a/azure-monitor-opentelemetry/tests/autoinstrumentation/test_distro.py +++ b/azure-monitor-opentelemetry/tests/autoinstrumentation/test_distro.py @@ -10,7 +10,7 @@ class TestDistro(TestCase): @patch( "azure.monitor.opentelemetry.autoinstrumentation._distro.AzureDiagnosticLogging.enable" ) - # TODO: Enabled when duplciate logging issue is solved + # TODO: Enabled when duplicate logging issue is solved # @patch( # "azure.monitor.opentelemetry.autoinstrumentation._diagnostic_logging._EXPORTER_DIAGNOSTICS_ENABLED", # False, diff --git a/azure-monitor-opentelemetry/tests/test_constants.py b/azure-monitor-opentelemetry/tests/test_constants.py index c81aff52..54f17340 100644 --- a/azure-monitor-opentelemetry/tests/test_constants.py +++ b/azure-monitor-opentelemetry/tests/test_constants.py @@ -47,7 +47,7 @@ def test_ikey_defaults(self): reload(_constants) self.assertEqual(_constants._CUSTOMER_IKEY, "unknown") - # TODO: Enabled when duplciate logging issue is solved + # TODO: Enabled when duplicate logging issue is solved # @patch.dict( # "os.environ", # {"AZURE_MONITOR_OPENTELEMETRY_DISTRO_ENABLE_EXPORTER_DIAGNOSTICS": "True"}, From 7e7a97b0ffd77e6d39c4ef34a8525f91a99d4596 Mon Sep 17 00:00:00 2001 From: jerevoss Date: Wed, 7 Jun 2023 17:11:37 -0700 Subject: [PATCH 2/3] spelling --- CHANGELOG.md | 2 ++ .../azure/monitor/opentelemetry/_configure.py | 2 +- .../azure/monitor/opentelemetry/_constants.py | 6 +++--- .../monitor/opentelemetry/autoinstrumentation/_distro.py | 2 +- azure-monitor-opentelemetry/samples/tracing/manual.py | 2 +- .../tests/autoinstrumentation/test_distro.py | 2 +- azure-monitor-opentelemetry/tests/test_constants.py | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13ffca69..8455cc87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Update samples ([#281](https://github.com/microsoft/ApplicationInsights-Python/pull/281)) +- Fixed spelling + ([#291](https://github.com/microsoft/ApplicationInsights-Python/pull/291)) ## [1.0.0b12](https://github.com/microsoft/ApplicationInsights-Python/releases/tag/v1.0.0b12) - 2023-05-05 diff --git a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py index 47873cbc..0073b427 100644 --- a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py +++ b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py @@ -145,7 +145,7 @@ def _setup_instrumentations(): instrumentor().instrument(skip_dep_check=True) except Exception as ex: _logger.warning( - "Exception occured when instrumenting: %s.", + "Exception occurred when instrumenting: %s.", lib_name, exc_info=ex, ) diff --git a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py index 7fe1b0dd..fd6518d4 100644 --- a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py +++ b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py @@ -30,7 +30,7 @@ _IS_ON_APP_SERVICE = "WEBSITE_SITE_NAME" in environ # TODO: Add environment variable to enabled diagnostics off of App Service _IS_DIAGNOSTICS_ENABLED = _IS_ON_APP_SERVICE -# TODO: Enabled when duplciate logging issue is solved +# TODO: Enabled when duplicate logging issue is solved # _EXPORTER_DIAGNOSTICS_ENABLED_ENV_VAR = ( # "AZURE_MONITOR_OPENTELEMETRY_DISTRO_ENABLE_EXPORTER_DIAGNOSTICS" # ) @@ -63,7 +63,7 @@ def _env_var_or_default(var_name, default_val=""): return default_val -# TODO: Enabled when duplciate logging issue is solved +# TODO: Enabled when duplicate logging issue is solved # def _is_exporter_diagnostics_enabled(): # return ( # _EXPORTER_DIAGNOSTICS_ENABLED_ENV_VAR in environ @@ -74,5 +74,5 @@ def _env_var_or_default(var_name, default_val=""): _EXTENSION_VERSION = _env_var_or_default( "ApplicationInsightsAgent_EXTENSION_VERSION", "disabled" ) -# TODO: Enabled when duplciate logging issue is solved +# TODO: Enabled when duplicate logging issue is solved # _EXPORTER_DIAGNOSTICS_ENABLED = _is_exporter_diagnostics_enabled() diff --git a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/autoinstrumentation/_distro.py b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/autoinstrumentation/_distro.py index 1ca3adf5..d9341050 100644 --- a/azure-monitor-opentelemetry/azure/monitor/opentelemetry/autoinstrumentation/_distro.py +++ b/azure-monitor-opentelemetry/azure/monitor/opentelemetry/autoinstrumentation/_distro.py @@ -34,7 +34,7 @@ def _configure(self, **kwargs) -> None: _configure_auto_instrumentation() except Exception as ex: _logger.exception( - ("Error occured auto-instrumenting AzureMonitorDistro") + ("Error occurred auto-instrumenting AzureMonitorDistro") ) raise ex diff --git a/azure-monitor-opentelemetry/samples/tracing/manual.py b/azure-monitor-opentelemetry/samples/tracing/manual.py index 7bbf1e50..feaa15f4 100644 --- a/azure-monitor-opentelemetry/samples/tracing/manual.py +++ b/azure-monitor-opentelemetry/samples/tracing/manual.py @@ -11,7 +11,7 @@ engine = create_engine("sqlite:///:memory:") # SQLAlchemy instrumentation is not officially supported by this package -# However, you can use the OpenTelemetry instument method manually in +# However, you can use the OpenTelemetry instrument method manually in # conjunction with configure_azure_monitor SQLAlchemyInstrumentor().instrument( engine=engine, diff --git a/azure-monitor-opentelemetry/tests/autoinstrumentation/test_distro.py b/azure-monitor-opentelemetry/tests/autoinstrumentation/test_distro.py index aae4653b..874ca922 100644 --- a/azure-monitor-opentelemetry/tests/autoinstrumentation/test_distro.py +++ b/azure-monitor-opentelemetry/tests/autoinstrumentation/test_distro.py @@ -10,7 +10,7 @@ class TestDistro(TestCase): @patch( "azure.monitor.opentelemetry.autoinstrumentation._distro.AzureDiagnosticLogging.enable" ) - # TODO: Enabled when duplciate logging issue is solved + # TODO: Enabled when duplicate logging issue is solved # @patch( # "azure.monitor.opentelemetry.autoinstrumentation._diagnostic_logging._EXPORTER_DIAGNOSTICS_ENABLED", # False, diff --git a/azure-monitor-opentelemetry/tests/test_constants.py b/azure-monitor-opentelemetry/tests/test_constants.py index c81aff52..54f17340 100644 --- a/azure-monitor-opentelemetry/tests/test_constants.py +++ b/azure-monitor-opentelemetry/tests/test_constants.py @@ -47,7 +47,7 @@ def test_ikey_defaults(self): reload(_constants) self.assertEqual(_constants._CUSTOMER_IKEY, "unknown") - # TODO: Enabled when duplciate logging issue is solved + # TODO: Enabled when duplicate logging issue is solved # @patch.dict( # "os.environ", # {"AZURE_MONITOR_OPENTELEMETRY_DISTRO_ENABLE_EXPORTER_DIAGNOSTICS": "True"}, From 1d8d9f5cf3e92dd8ce4ec02232b48ae971a88ee1 Mon Sep 17 00:00:00 2001 From: jerevoss Date: Thu, 8 Jun 2023 12:39:17 -0700 Subject: [PATCH 3/3] spelling --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8455cc87..e9b5616c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,11 +76,11 @@ ([#242](https://github.com/microsoft/ApplicationInsights-Python/pull/242)) - Update to azure-monitor-opentelemetry-exporter 1.0.0b12 ([#243](https://github.com/microsoft/ApplicationInsights-Python/pull/243)) -- Move symbols to protected, add docstring for api, pin opentelemtry-api/sdk versions +- Move symbols to protected, add docstring for api, pin opentelemetry-api/sdk versions ([#244](https://github.com/microsoft/ApplicationInsights-Python/pull/244)) - Replace service.X configurations with Resource ([#246](https://github.com/microsoft/ApplicationInsights-Python/pull/246)) -- Change namespace to `azure.monitor.opentelemtry` +- Change namespace to `azure.monitor.opentelemetry` ([#247](https://github.com/microsoft/ApplicationInsights-Python/pull/247)) - Updating documents for new namespace ([#249](https://github.com/microsoft/ApplicationInsights-Python/pull/249))