address comments

Author: sfc-gh-yuwang

src/snowflake/snowpark/_internal/external_telemetry.py

@@ -3,7 +3,7 @@
 #
 import importlib
 from abc import ABC
-from typing import Dict, Optional
+from typing import Dict, Optional, Tuple
 from snowflake.connector.options import MissingOptionalDependency, ModuleLikeObject
 import snowflake.snowpark
 import requests
@@ -13,7 +13,7 @@ class MissingOpenTelemetry(MissingOptionalDependency):
     _dep_name = "opentelemetry"
 
 
-def _import_or_missing_opentelemetry() -> tuple[ModuleLikeObject, bool]:
+def _import_or_missing_opentelemetry() -> Tuple[ModuleLikeObject, bool]:
     try:
         opentelemetry = importlib.import_module("opentelemetry")
         importlib.import_module("opentelemetry.sdk")
@@ -24,13 +24,13 @@ def _import_or_missing_opentelemetry() -> tuple[ModuleLikeObject, bool]:
         return MissingOpenTelemetry(), False
 
 
-opentelemetry, installed_opentelemery = _import_or_missing_opentelemetry()
+opentelemetry, installed_opentelemetry = _import_or_missing_opentelemetry()
 
-BaseLogProvider = opentelemetry._logs.LoggerProvider if installed_opentelemery else ABC
+BaseLogProvider = opentelemetry._logs.LoggerProvider if installed_opentelemetry else ABC
 BaseTraceProvider = (
-    opentelemetry.trace.TracerProvider if installed_opentelemery else ABC
+    opentelemetry.trace.TracerProvider if installed_opentelemetry else ABC
 )
-Attributes = opentelemetry.util.types.Attributes if installed_opentelemery else ABC
+Attributes = opentelemetry.util.types.Attributes if installed_opentelemetry else ABC
 
 
 class RetryWithTokenRefreshAdapter(requests.adapters.HTTPAdapter):

src/snowflake/snowpark/session.py

@@ -237,7 +237,7 @@
 
 from snowflake.snowpark._internal.external_telemetry import (
     opentelemetry,
-    installed_opentelemery,
+    installed_opentelemetry,
     RetryWithTokenRefreshAdapter,
     ProxyTracerProvider,
 )
@@ -4975,7 +4975,7 @@ def enable_external_telemetry(
 
         Note:
             Please use logging.getLogger().setLevel(<log level>) instead of logging.basicConfig(<log leve>)
-            because the later will not work with exsiting handlers.
+            because the later will not work with existing handlers.
             This function requires the `opentelemetry` extra from Snowpark.
             Install it via pip:
 
@@ -4987,7 +4987,7 @@ def enable_external_telemetry(
             enable_trace_level: A bool value indicate whether traces are collected into event_table
 
         Examples 1
-            >>> session.enable_external_telemetry("db.sc.external_et", True, True)
+            >>> session.enable_external_telemetry("db.sc.external_et", logging.INFO, True)
             >>> logging.getLogger().setLevel(logging.INFO)
             >>> tracer = trace.get_tracer("external_telemetry")
             >>> with tracer.start_as_current_span("code_store") as span:
@@ -5000,7 +5000,7 @@ def enable_external_telemetry(
             >>> logging.getLogger().setLevel(logging.INFO)
             >>> logging.info("log before enable external telemetry") # this log is not sent to event table
 
-            >>> session.enable_external_telemetry("db.sc.external_et", True, True)
+            >>> session.enable_external_telemetry("db.sc.external_et", logging.INFO, True)
 
             >>> tracer = trace.get_tracer("external_telemetry")
             >>> with tracer.start_as_current_span("code_store") as span:
@@ -5012,15 +5012,15 @@ def enable_external_telemetry(
 
             >>> logging.info("out of scope log")  # this log is not sent to event table
 
-            >>> session.enable_external_telemetry("db.sc.external_et", True, True)
+            >>> session.enable_external_telemetry("db.sc.external_et", logging.INFO, True)
 
             >>> logging.getLogger().setLevel(logging.DEBUG)
             >>> logging.debug("debug log") # this log is sent to event table because external telemetry is re-enabled
 
             >>> session.disable_external_telemetry()
 
         """
-        if not installed_opentelemery:
+        if not installed_opentelemetry:
             _logger.debug(
                 f"Opentelemetry dependencies are missing, no telemetry export into event table: {event_table}"
             )
@@ -5204,10 +5204,9 @@ def _init_log_level(
         self._proxy_log_provider.enable()
 
         self._log_handler = opentelemetry.sdk._logs.LoggingHandler(
-            logger_provider=self._proxy_log_provider
+            logger_provider=self._proxy_log_provider, level=log_level
         )
         logging.getLogger().addHandler(self._log_handler)
-        logging.getLogger().setLevel(log_level)
 
         self._logger_provider_enabled = True
 

tests/integ/test_external_telemetry.py

@@ -69,7 +69,7 @@ def export(self, batch):
 class MockOTLPSpanExporter(OTLPSpanExporter):
     def export(self, batch):
         if self._shutdown:
-            return LogExportResult.FAILURE
+            return SpanExportResult.FAILURE
         with lock:
             if self._endpoint in mock_tracer_results:
                 mock_tracer_results[self._endpoint].extend(batch)