locust 2.44.1.dev20__tar.gz → 2.44.1.dev34__tar.gz

{locust-2.44.1.dev20 → locust-2.44.1.dev34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust
-Version: 2.44.1.dev20
+Version: 2.44.1.dev34
 Summary: Developer-friendly load testing framework
 Project-URL: homepage, https://locust.io/
 Project-URL: repository, https://github.com/locustio/locust
@@ -144,7 +144,9 @@ Locust's code base is intentionally kept small and doesn't solve everything out
 
 ## VS Code extension
 
-Microsoft has built an excellent [VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-azure-load-testing.microsoft-testing) that uses [Copilot](https://github.com/features/copilot) to help you create and run Locust tests.
+Microsoft has built an excellent [VS Code extension](https://learn.microsoft.com/azure/app-testing/load-testing/quickstart-create-run-load-tests-from-visual-studio-code) that uses [Copilot](https://github.com/features/copilot) to help you create and run Locust tests. Here's a video to get you started:
+
+[![Youtube video](https://img.youtube.com/vi/J4pIBwocmvE/maxresdefault.jpg)](https://youtu.be/J4pIBwocmvE)
 
 ## Azure Load Testing
 

{locust-2.44.1.dev20 → locust-2.44.1.dev34}/README.md

@@ -84,7 +84,9 @@ Locust's code base is intentionally kept small and doesn't solve everything out
 
 ## VS Code extension
 
-Microsoft has built an excellent [VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-azure-load-testing.microsoft-testing) that uses [Copilot](https://github.com/features/copilot) to help you create and run Locust tests.
+Microsoft has built an excellent [VS Code extension](https://learn.microsoft.com/azure/app-testing/load-testing/quickstart-create-run-load-tests-from-visual-studio-code) that uses [Copilot](https://github.com/features/copilot) to help you create and run Locust tests. Here's a video to get you started:
+
+[![Youtube video](https://img.youtube.com/vi/J4pIBwocmvE/maxresdefault.jpg)](https://youtu.be/J4pIBwocmvE)
 
 ## Azure Load Testing
 

{locust-2.44.1.dev20 → locust-2.44.1.dev34}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.44.1.dev20'
-__version_tuple__ = version_tuple = (2, 44, 1, 'dev20')
+__version__ = version = '2.44.1.dev34'
+__version_tuple__ = version_tuple = (2, 44, 1, 'dev34')
 
 __commit_id__ = commit_id = None

{locust-2.44.1.dev20 → locust-2.44.1.dev34}/locust/main.py

@@ -180,7 +180,7 @@ def main():
     start_message = f"Starting Locust {version}"
 
     if options.otel:
-        if setup_opentelemetry():
+        if setup_opentelemetry(options.locustfile, options.profile):
             start_message += ", OpenTelemetry enabled"
 
     children = []

{locust-2.44.1.dev20 → locust-2.44.1.dev34}/locust/opentelemetry.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import socket
 from urllib.parse import urlparse
 
 from ._version import __version__
@@ -7,9 +8,9 @@ from ._version import __version__
 logger = logging.getLogger(__name__)
 
 
-def setup_opentelemetry() -> bool:
+def setup_opentelemetry(locustfile: str, profile: str | None) -> bool:
     try:
-        from opentelemetry import metrics, trace
+        from opentelemetry import _logs, metrics, trace
         from opentelemetry.sdk.resources import Resource
     except ImportError:
         logger.error("OpenTelemetry SDK is not installed, opentelemetry not enabled. Run 'pip install locust[otel]'")
@@ -17,8 +18,9 @@ def setup_opentelemetry() -> bool:
 
     traces_exporters = {e.strip().lower() for e in os.getenv("OTEL_TRACES_EXPORTER", "otlp").split(",") if e.strip()}
     metrics_exporters = {e.strip().lower() for e in os.getenv("OTEL_METRICS_EXPORTER", "otlp").split(",") if e.strip()}
+    logs_exporters = {e.strip().lower() for e in os.getenv("OTEL_LOGS_EXPORTER", "otlp").split(",") if e.strip()}
 
-    if traces_exporters == {"none"} and metrics_exporters == {"none"}:
+    if traces_exporters == {"none"} and metrics_exporters == {"none"} and logs_exporters == {"none"}:
         logger.info("No OpenTelemetry exporters configured, opentelemetry not enabled")
         return False
 
@@ -26,6 +28,9 @@ def setup_opentelemetry() -> bool:
         {
             "service.name": os.getenv("OTEL_SERVICE_NAME", "locust"),
             "service.version": __version__,
+            "host.name": socket.gethostname(),
+            "filename": locustfile,
+            "profile": profile or "",
         }
     )
 
@@ -37,6 +42,10 @@ def setup_opentelemetry() -> bool:
         meter_provider = _setup_meter_provider(resource, metrics_exporters)
         metrics.set_meter_provider(meter_provider)
 
+    if logs_exporters:
+        logger_provider = _setup_logger_provider(resource, logs_exporters)
+        _logs.set_logger_provider(logger_provider)
+
     _setup_auto_instrumentation()
 
     logger.debug("OpenTelemetry configured!")
@@ -139,6 +148,63 @@ def _setup_meter_provider(resource, metrics_exporters):
     return MeterProvider(resource=resource, metric_readers=metric_readers)
 
 
+def _setup_logger_provider(resource, logs_exporters):
+    from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
+    from opentelemetry.sdk._logs.export import (
+        BatchLogRecordProcessor,
+        ConsoleLogRecordExporter,
+        SimpleLogRecordProcessor,
+    )
+
+    logger_provider = LoggerProvider(resource=resource)
+
+    for exporter in logs_exporters:
+        if exporter == "otlp":
+            protocol = (
+                os.getenv("OTEL_EXPORTER_OTLP_LOGS_PROTOCOL", os.getenv("OTEL_EXPORTER_OTLP_PROTOCOL", "grpc"))
+                .lower()
+                .strip()
+            )
+            try:
+                if protocol == "grpc":
+                    from opentelemetry.exporter.otlp.proto.grpc._log_exporter import OTLPLogExporter
+                elif protocol == "http/protobuf" or protocol == "http":
+                    from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
+                else:
+                    logger.warning(
+                        f"Unknown OpenTelemetry otlp exporter protocol '{protocol}'. Use 'grpc' or 'http/protobuf'"
+                    )
+                    continue
+            except ImportError:
+                logger.warning(
+                    f"OpenTelemetry otlp exporter for '{protocol}' is not available. Please install the required package: opentelemetry-exporter-otlp-proto-{'grpc' if protocol == 'grpc' else 'http'}"
+                )
+                continue
+
+            logger_provider.add_log_record_processor(BatchLogRecordProcessor(OTLPLogExporter()))
+            logger.debug("Configured logs exporter: otlp")
+
+        elif exporter == "console":
+            logger_provider.add_log_record_processor(SimpleLogRecordProcessor(ConsoleLogRecordExporter()))
+            logger.debug("Configured logs exporter: console")
+
+        elif exporter == "none":
+            continue
+
+        else:
+            logger.warning(f"Unknown logs exporter '{exporter}'. Ignored")
+
+    # set up logging bridge
+    otel_handler = LoggingHandler(logger_provider=logger_provider)
+    otel_handler.name = "opentelemetry"
+    logging.getLogger().addHandler(otel_handler)
+    # locust loggers are configured with propagate=False, so they need this handler explicitly.
+    logging.getLogger("locust").addHandler(otel_handler)
+    logging.getLogger("locust.stats_logger").addHandler(otel_handler)
+
+    return logger_provider
+
+
 def _setup_auto_instrumentation():
     try:
         import requests