Merge branch 'main' of https://github.com/microsoft/ApplicationInsights-Python into instr

Author: lzchen

CHANGELOG.md

@@ -12,6 +12,8 @@
     ([#256](https://github.com/microsoft/ApplicationInsights-Python/pull/256))
 - Change instrumentation config to use TypedDict InstrumentationConfig
     ([#259](https://github.com/microsoft/ApplicationInsights-Python/pull/259))
+- Change interval params to use `_ms` as suffix
+    ([#260](https://github.com/microsoft/ApplicationInsights-Python/pull/260))
 
 ## [1.0.0b10](https://github.com/microsoft/ApplicationInsights-Python/releases/tag/v1.0.0b10) - 2023-02-23
 

azure-monitor-opentelemetry/README.md

@@ -74,11 +74,11 @@ Take a look at the specific [instrumenation][ot_instrumentations] documentation
 * resource - Specified the OpenTelemetry [resource][opentelemetry_spec_resource] associated with your application. See [this][ot_sdk_python_resource] for default behavior.
 * logging_level - Specifies the [logging level][logging_level] of the logs you would like to collect for your logging pipeline. Defaults to logging.NOTSET.
 * logger_name = Specifies the [logger name][logger_name_hierarchy_doc] under which logging will be instrumented. Defaults to "" which corresponds to the root logger.
-* logging_export_interval_millis - Specifies the logging export interval in milliseconds. Defaults to 5000.
+* logging_export_interval_ms - Specifies the logging export interval in milliseconds. Defaults to 5000.
 * metric_readers - Specifies the [metric readers][ot_metric_reader] that you would like to use for your metric pipeline. Accepts a list of [metric readers][ot_sdk_python_metric_reader].
 * views - Specifies the list of [views][opentelemetry_spec_view] to configure for the metric pipeline. See [here][ot_sdk_python_view_examples] for example usage.
 * sampling_ratio - Specifies the ratio of distributed tracing telemetry to be [sampled][application_insights_sampling]. Accepted values are in the range [0,1]. Defaults to 1.0, meaning no telemetry is sampled out.
-* tracing_export_interval_millis - Specifies the distributed tracing export interval in milliseconds. Defaults to 5000.
+* tracing_export_interval_ms - Specifies the distributed tracing export interval in milliseconds. Defaults to 5000.
 
 #### Azure monitor OpenTelemetry Exporter configurations
 

azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py

@@ -60,11 +60,11 @@ def configure_azure_monitor(**kwargs) -> None:
     :keyword bool disable_tracing: If set to `True`, disables collection and export of distributed tracing telemetry. Defaults to `False`.
     :keyword int logging_level: Specifies the logging of the logs you would like to collect for your logging pipeline.
     :keyword str logger_name: Specifies the logger name under which logging will be instrumented. Defaults to "" which corresponds to the root logger.
-    :keyword int logging_export_interval_millis: Specifies the logging export interval in milliseconds. Defaults to 5000.
+    :keyword int logging_export_interval_ms: Specifies the logging export interval in milliseconds. Defaults to 5000.
     :keyword Sequence[MetricReader] metric_readers: Specifies the metric readers that you would like to use for your metric pipeline.
     :keyword Sequence[View] views: Specifies the list of views to configure for the metric pipeline.
     :keyword float sampling_ratio: Specifies the ratio of distributed tracing telemetry to be sampled. Accepted values are in the range [0,1]. Defaults to 1.0, meaning no telemetry is sampled out.
-    :keyword int tracing_export_interval_millis: Specifies the distributed tracing export interval in milliseconds. Defaults to 5000.
+    :keyword int tracing_export_interval_ms: Specifies the distributed tracing export interval in milliseconds. Defaults to 5000.
     :keyword InstrumentationConfig instrumentation_config: Specifies a dictionary of kwargs that will be applied to instrumentation configuration. You can specify which instrumentation you want to
         configure by name in the key field and value as a dictionary representing `kwargs` for the corresponding instrumentation.
         Refer to the `Supported Library` section of https://github.com/microsoft/ApplicationInsights-Python/tree/main/azure-monitor-opentelemetry#officially-supported-instrumentations for the list of suppoprted library names.
@@ -109,8 +109,8 @@ def _setup_tracing(
     resource: Resource, configurations: Dict[str, ConfigurationValue]
 ):
     sampling_ratio = configurations.get("sampling_ratio", 1.0)
-    tracing_export_interval_millis = configurations.get(
-        "tracing_export_interval_millis", 5000
+    tracing_export_interval_ms = configurations.get(
+        "tracing_export_interval_ms", 5000
     )
     tracer_provider = TracerProvider(
         sampler=ApplicationInsightsSampler(sampling_ratio=sampling_ratio),
@@ -120,7 +120,7 @@ def _setup_tracing(
     trace_exporter = AzureMonitorTraceExporter(**configurations)
     span_processor = BatchSpanProcessor(
         trace_exporter,
-        schedule_delay_millis=tracing_export_interval_millis,
+        schedule_delay_millis=tracing_export_interval_ms,
     )
     get_tracer_provider().add_span_processor(span_processor)
 
@@ -130,15 +130,15 @@ def _setup_logging(
 ):
     logger_name = configurations.get("logger_name", "")
     logging_level = configurations.get("logging_level", NOTSET)
-    logging_export_interval_millis = configurations.get(
-        "logging_export_interval_millis", 5000
+    logging_export_interval_ms = configurations.get(
+        "logging_export_interval_ms", 5000
     )
     logger_provider = LoggerProvider(resource=resource)
     set_logger_provider(logger_provider)
     log_exporter = AzureMonitorLogExporter(**configurations)
     log_record_processor = BatchLogRecordProcessor(
         log_exporter,
-        schedule_delay_millis=logging_export_interval_millis,
+        schedule_delay_millis=logging_export_interval_ms,
     )
     get_logger_provider().add_log_record_processor(log_record_processor)
     handler = LoggingHandler(

azure-monitor-opentelemetry/samples/logging/logs_with_traces.py

@@ -15,7 +15,7 @@
     logging_level=WARNING,
     disable_metrics=True,
     instrumentations=["flask"],
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
 )
 
 logger = getLogger(__name__)

azure-monitor-opentelemetry/samples/tracing/db_psycopg2.py

@@ -11,7 +11,7 @@
     connection_string="<your-connection-string>",
     disable_logging=True,
     disable_metrics=True,
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
 )
 
 # Database calls using the psycopg2 library will be automatically captured

azure-monitor-opentelemetry/samples/tracing/django/sample/example/views.py

@@ -12,7 +12,7 @@
     connection_string="<your-connection-string>",
     disable_logging=True,
     disable_metrics=True,
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
 )
 
 

azure-monitor-opentelemetry/samples/tracing/http_fastapi.py

@@ -16,7 +16,7 @@
             "excluded_urls": "http://127.0.0.1:8000/exclude",
         }
     },
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
 )
 
 app = fastapi.FastAPI()

azure-monitor-opentelemetry/samples/tracing/http_flask.py

@@ -16,7 +16,7 @@
             "excluded_urls": "http://localhost:8080/ignore",
         }
     },
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
 )
 
 app = flask.Flask(__name__)

azure-monitor-opentelemetry/samples/tracing/http_requests.py

@@ -21,7 +21,7 @@
             "excluded_urls": "http://example.com",
         }
     },
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
 )
 
 tracer = trace.get_tracer(__name__)

azure-monitor-opentelemetry/samples/tracing/http_urllib.py

@@ -16,7 +16,7 @@
     connection_string="<your-connection-string>",
     disable_logging=True,
     disable_metrics=True,
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
 )
 
 tracer = trace.get_tracer(__name__)

azure-monitor-opentelemetry/samples/tracing/http_urllib3.py

@@ -16,7 +16,7 @@
     connection_string="<your-connection-string>",
     disable_logging=True,
     disable_metrics=True,
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
 )
 
 http = urllib3.PoolManager()

azure-monitor-opentelemetry/samples/tracing/manual.py

@@ -9,7 +9,7 @@
 
 configure_azure_monitor(
     connection_string="<your-connection-string>",
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
     disable_logging=True,
     disable_metrics=True,
 )

azure-monitor-opentelemetry/samples/tracing/sampling.py

@@ -12,7 +12,7 @@
     # Sampling ratio of between 0 and 1 inclusive
     # 0.1 means approximately 10% of your traces are sent
     sampling_ratio=0.1,
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
     disable_logging=True,
     disable_metrics=True,
 )

azure-monitor-opentelemetry/samples/tracing/simple.py

@@ -16,7 +16,7 @@
             ResourceAttributes.SERVICE_INSTANCE_ID: "simple_tracing_instance",
         }
     ),
-    tracing_export_interval_millis=15000,
+    tracing_export_interval_ms=15000,
     disable_logging=True,
     disable_metrics=True,
 )

azure-monitor-opentelemetry/tests/configuration/test_configure.py

@@ -55,15 +55,15 @@ def test_configure_azure_monitor(
             "disable_tracing": False,
             "disable_logging": False,
             "disable_metrics": False,
-            "logging_export_interval_millis": 10000,
+            "logging_export_interval_ms": 10000,
             "logging_level": "test_logging_level",
             "logger_name": "test_logger_name",
             "metric_readers": "test_metric_readers",
             "service_name": "test_service_name",
             "service_namespace": "test_namespace",
             "service_instance_id": "test_id",
             "sampling_ratio": 0.5,
-            "tracing_export_interval_millis": 15000,
+            "tracing_export_interval_ms": 15000,
             "views": "test_views",
         }
         resource_init_mock = Mock()
@@ -103,14 +103,14 @@ def test_configure_azure_monitor_disable_tracing(
             "disable_tracing": True,
             "disable_logging": False,
             "disable_metrics": False,
-            "logging_export_interval_millis": 10000,
+            "logging_export_interval_ms": 10000,
             "logging_level": "test_logging_level",
             "logger_name": "test_logger_name",
             "service_name": "test_service_name",
             "service_namespace": "test_namespace",
             "service_instance_id": "test_id",
             "sampling_ratio": 0.5,
-            "tracing_export_interval_millis": 15000,
+            "tracing_export_interval_ms": 15000,
             "views": "test_views",
         }
         resource_init_mock = Mock()
@@ -150,14 +150,14 @@ def test_configure_azure_monitor_disable_logging(
             "disable_tracing": False,
             "disable_logging": True,
             "disable_metrics": False,
-            "logging_export_interval_millis": 10000,
+            "logging_export_interval_ms": 10000,
             "logging_level": "test_logging_level",
             "logger_name": "test_logger_name",
             "service_name": "test_service_name",
             "service_namespace": "test_namespace",
             "service_instance_id": "test_id",
             "sampling_ratio": 0.5,
-            "tracing_export_interval_millis": 15000,
+            "tracing_export_interval_ms": 15000,
             "views": "test_views",
         }
         resource_init_mock = Mock()
@@ -197,13 +197,13 @@ def test_configure_azure_monitor_disable_metrics(
             "disable_tracing": False,
             "disable_logging": False,
             "disable_metrics": True,
-            "logging_export_interval_millis": 10000,
+            "logging_export_interval_ms": 10000,
             "logging_level": "test_logging_level",
             "service_name": "test_service_name",
             "service_namespace": "test_namespace",
             "service_instance_id": "test_id",
             "sampling_ratio": 0.5,
-            "tracing_export_interval_millis": 15000,
+            "tracing_export_interval_ms": 15000,
             "views": "test_views",
         }
         resource_init_mock = Mock()
@@ -271,7 +271,7 @@ def test_setup_tracing(
             "connection_string": "test_cs",
             "disable_tracing": False,
             "sampling_ratio": 0.5,
-            "tracing_export_interval_millis": 15000,
+            "tracing_export_interval_ms": 15000,
         }
         _setup_tracing(resource_mock, configurations)
         sampler_mock.assert_called_once_with(sampling_ratio=0.5)
@@ -336,7 +336,7 @@ def test_setup_logging(
         configurations = {
             "connection_string": "test_cs",
             "disable_logging": False,
-            "logging_export_interval_millis": 10000,
+            "logging_export_interval_ms": 10000,
             "logging_level": "test_logging_level",
             "logger_name": "test_logger_name",
         }