Vendor 0.40

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+- Unpin OTel SDK/API version
+    ([#310](https://github.com/microsoft/ApplicationInsights-Python/pull/310))
+- Replace explicit log processor exporter interval env var with OT SDK env var
+    ([#311](https://github.com/microsoft/ApplicationInsights-Python/pull/311))
+- Update vendored instrumentations to 0.40b0
+    ([#309](https://github.com/microsoft/ApplicationInsights-Python/pull/309))
+
 ## [1.0.0b15](https://github.com/microsoft/ApplicationInsights-Python/releases/tag/v1.0.0b15) - 2023-07-17
 
 - Upgrade to exporter 1.0.0b15 and OTel 1.19

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

@@ -14,14 +14,13 @@
     DISABLE_METRICS_ARG,
     DISABLE_TRACING_ARG,
     DISABLED_INSTRUMENTATIONS_ARG,
-    LOGGING_EXPORT_INTERVAL_MS_ARG,
     SAMPLING_RATIO_ARG,
 )
 from azure.monitor.opentelemetry._types import ConfigurationValue
-from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.dependencies import (
+from azure.monitor.opentelemetry._vendor.v0_40b0.opentelemetry.instrumentation.dependencies import (
     get_dependency_conflicts,
 )
-from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.instrumentor import (
+from azure.monitor.opentelemetry._vendor.v0_40b0.opentelemetry.instrumentation.instrumentor import (
     BaseInstrumentor,
 )
 from azure.monitor.opentelemetry.exporter import (
@@ -52,7 +51,7 @@
     "psycopg2": ("psycopg2 >= 2.7.3.1",),
     "requests": ("requests ~= 2.0",),
     "urllib": tuple(),
-    "urllib3": ("urllib3 >= 1.0.0, < 2.0.0",),
+    "urllib3": ("urllib3 >= 1.0.0, < 3.0.0",),
 }
 
 
@@ -113,14 +112,11 @@ def _setup_tracing(configurations: Dict[str, ConfigurationValue]):
 
 
 def _setup_logging(configurations: Dict[str, ConfigurationValue]):
-    # TODO: Remove after upgrading to OTel SDK 1.18
-    logging_export_interval_ms = configurations[LOGGING_EXPORT_INTERVAL_MS_ARG]
     logger_provider = LoggerProvider()
     set_logger_provider(logger_provider)
     log_exporter = AzureMonitorLogExporter(**configurations)
     log_record_processor = BatchLogRecordProcessor(
         log_exporter,
-        schedule_delay_millis=logging_export_interval_ms,
     )
     get_logger_provider().add_log_record_processor(log_record_processor)
     handler = LoggingHandler(logger_provider=get_logger_provider())

azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py

@@ -21,7 +21,6 @@
 DISABLE_METRICS_ARG = "disable_metrics"
 DISABLE_TRACING_ARG = "disable_tracing"
 DISABLED_INSTRUMENTATIONS_ARG = "disabled_instrumentations"
-LOGGING_EXPORT_INTERVAL_MS_ARG = "logging_export_interval_ms"
 SAMPLING_RATIO_ARG = "sampling_ratio"
 
 

azure-monitor-opentelemetry/azure/monitor/opentelemetry/_vendor/v0_39b0/opentelemetry/instrumentation/asgi/__init__.py → azure-monitor-opentelemetry/azure/monitor/opentelemetry/_vendor/v0_40b0/opentelemetry/instrumentation/asgi/__init__.py

@@ -23,13 +23,11 @@
 from asgiref.compatibility import guarantee_single_callable
 
 from opentelemetry import context, trace
-from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.asgi.version import (
-    __version__
-)  # noqa
-from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.propagators import (
+from azure.monitor.opentelemetry._vendor.v0_40b0.opentelemetry.instrumentation.asgi.version import __version__  # noqa
+from azure.monitor.opentelemetry._vendor.v0_40b0.opentelemetry.instrumentation.propagators import (
     get_global_response_propagator,
 )
-from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.utils import (
+from azure.monitor.opentelemetry._vendor.v0_40b0.opentelemetry.instrumentation.utils import (
     _start_internal_or_server_span,
     http_status_to_status_code,
 )
@@ -39,7 +37,7 @@
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import Span, set_span_in_context
 from opentelemetry.trace.status import Status, StatusCode
-from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.util.http import (
+from azure.monitor.opentelemetry._vendor.v0_40b0.opentelemetry.util.http import (
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SANITIZE_FIELDS,
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST,
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE,
@@ -242,18 +240,23 @@ def set_status_code(span, status_code):
 
 
 def get_default_span_details(scope: dict) -> Tuple[str, dict]:
-    """Default implementation for get_default_span_details
+    """
+    Default span name is the HTTP method and URL path, or just the method.
+    https://github.com/open-telemetry/opentelemetry-specification/pull/3165
+    https://opentelemetry.io/docs/reference/specification/trace/semantic_conventions/http/#name
+
     Args:
         scope: the ASGI scope dictionary
     Returns:
         a tuple of the span name, and any attributes to attach to the span.
     """
-    span_name = (
-        scope.get("path", "").strip()
-        or f"HTTP {scope.get('method', '').strip()}"
-    )
-
-    return span_name, {}
+    path = scope.get("path", "").strip()
+    method = scope.get("method", "").strip()
+    if method and path:  # http
+        return f"{method} {path}", {}
+    if path:  # websocket
+        return path, {}
+    return method, {}  # http with no path
 
 
 def _collect_target_attribute(
@@ -328,6 +331,16 @@ def __init__(
             unit="ms",
             description="measures the duration of the inbound HTTP request",
         )
+        self.server_response_size_histogram = self.meter.create_histogram(
+            name=MetricInstruments.HTTP_SERVER_RESPONSE_SIZE,
+            unit="By",
+            description="measures the size of HTTP response messages (compressed).",
+        )
+        self.server_request_size_histogram = self.meter.create_histogram(
+            name=MetricInstruments.HTTP_SERVER_REQUEST_SIZE,
+            unit="By",
+            description="Measures the size of HTTP request messages (compressed).",
+        )
         self.active_requests_counter = self.meter.create_up_down_counter(
             name=MetricInstruments.HTTP_SERVER_ACTIVE_REQUESTS,
             unit="requests",
@@ -340,6 +353,7 @@ def __init__(
         self.server_request_hook = server_request_hook
         self.client_request_hook = client_request_hook
         self.client_response_hook = client_response_hook
+        self.content_length_header = None
 
     async def __call__(self, scope, receive, send):
         """The ASGI application
@@ -415,6 +429,20 @@ async def __call__(self, scope, receive, send):
                 self.active_requests_counter.add(
                     -1, active_requests_count_attrs
                 )
+                if self.content_length_header:
+                    self.server_response_size_histogram.record(
+                        self.content_length_header, duration_attrs
+                    )
+                request_size = asgi_getter.get(scope, "content-length")
+                if request_size:
+                    try:
+                        request_size_amount = int(request_size[0])
+                    except ValueError:
+                        pass
+                    else:
+                        self.server_request_size_histogram.record(
+                            request_size_amount, duration_attrs
+                        )
             if token:
                 context.detach(token)
 
@@ -482,6 +510,13 @@ async def otel_send(message):
                         setter=asgi_setter,
                     )
 
+                content_length = asgi_getter.get(message, "content-length")
+                if content_length:
+                    try:
+                        self.content_length_header = int(content_length[0])
+                    except ValueError:
+                        pass
+
                 await send(message)
 
         return otel_send

azure-monitor-opentelemetry/azure/monitor/opentelemetry/_vendor/v0_39b0/opentelemetry/instrumentation/flask/version.py → azure-monitor-opentelemetry/azure/monitor/opentelemetry/_vendor/v0_40b0/opentelemetry/instrumentation/asgi/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.39b0"
+__version__ = "0.40b0"

azure-monitor-opentelemetry/azure/monitor/opentelemetry/_vendor/v0_39b0/opentelemetry/instrumentation/auto_instrumentation/__init__.py → azure-monitor-opentelemetry/azure/monitor/opentelemetry/_vendor/v0_40b0/opentelemetry/instrumentation/auto_instrumentation/__init__.py

@@ -23,9 +23,7 @@
 
 from pkg_resources import iter_entry_points
 
-from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.version import (
-    __version__
-)
+from azure.monitor.opentelemetry._vendor.v0_40b0.opentelemetry.instrumentation.version import __version__
 
 _logger = getLogger(__name__)