Merge pull request #322 from Scale3-Labs/release-2.3.2

Release 2.3.2

Author: alizenhom

src/langtrace_python_sdk/extensions/langtrace_exporter.py

@@ -76,7 +76,29 @@ def export(self, spans: typing.Sequence[ReadableSpan]) -> SpanExportResult:
         Returns:
             The result of the export SUCCESS or FAILURE
         """
-        if not self.api_key and not self.disable_logging:
+        headers = {
+            "Content-Type": "application/json",
+            "x-api-key": self.api_key,
+            "User-Agent": "LangtraceExporter",
+        }
+
+        # Check if the OTEL_EXPORTER_OTLP_HEADERS environment variable is set
+        otel_headers = os.getenv("OTEL_EXPORTER_OTLP_HEADERS", None)
+        if otel_headers:
+            # Parse and add to headers
+            for header in otel_headers.split(","):
+                key, value = header.split("=")
+                headers[key.strip()] = value.strip()
+
+        # Check if the OTEL_EXPORTER_OTLP_TRACES_HEADERS environment variable is set
+        otel_traces_headers = os.getenv("OTEL_EXPORTER_OTLP_TRACES_HEADERS", None)
+        if otel_traces_headers:
+            # Parse and add to headers
+            for header in otel_traces_headers.split(","):
+                key, value = header.split("=")
+                headers[key.strip()] = value.strip()
+
+        if not headers["x-api-key"] and not self.disable_logging:
             print(Fore.RED)
             print(
                 "Missing Langtrace API key, proceed to https://langtrace.ai to create one"
@@ -101,26 +123,42 @@ def export(self, spans: typing.Sequence[ReadableSpan]) -> SpanExportResult:
             response = requests.post(
                 url=f"{self.api_host}",
                 data=json.dumps(data),
-                headers={
-                    "Content-Type": "application/json",
-                    "x-api-key": self.api_key,
-                    "User-Agent": "LangtraceExporter",
-                },
+                headers=headers,
                 timeout=20,
             )
 
             if not response.ok:
                 raise RequestException(response.text)
             if not self.disable_logging:
                 print(
-                    Fore.GREEN + f"Exported {len(spans)} spans successfully." + Fore.RESET
+                    Fore.GREEN
+                    + f"Exported {len(spans)} spans successfully."
+                    + Fore.RESET
                 )
             return SpanExportResult.SUCCESS
         except RequestException as err:
             if not self.disable_logging:
                 print(Fore.RED + "Failed to export spans.")
-                print(Fore.RED + f"Error: {err}" + Fore.RESET)
+                print(Fore.RED + f"Error: {err}\r\n" + Fore.RESET)
+                if (
+                    "invalid api key" in str(err).lower()
+                    and self.api_host == f"{LANGTRACE_REMOTE_URL}/api/trace"
+                ):
+                    print(
+                        Fore.YELLOW
+                        + "If you're self-hosting Langtrace, make sure to do one of the following to configure your trace endpoint (e.g., http://localhost:3000/api/trace):"
+                        + Fore.YELLOW
+                    )
+                    print(
+                        Fore.YELLOW
+                        + "1. Set the `LANGTRACE_API_HOST` environment variable, or\r\n2. Pass the `api_host` parameter to the `langtrace.init()` method.\r\n"
+                        + Fore.YELLOW
+                    )
             return SpanExportResult.FAILURE
 
     def shutdown(self) -> None:
-        print(Fore.WHITE + "⭐ Leave our github a star to stay on top of our updates - https://github.com/Scale3-Labs/langtrace" + Fore.RESET)
+        print(
+            Fore.WHITE
+            + "⭐ Leave our github a star to stay on top of our updates - https://github.com/Scale3-Labs/langtrace"
+            + Fore.RESET
+        )

src/langtrace_python_sdk/langtrace.py

@@ -80,11 +80,19 @@ def init(
         sys.stdout = open(os.devnull, "w")
 
     host = (
-        os.environ.get("LANGTRACE_API_HOST", None) or api_host or LANGTRACE_REMOTE_URL
+        os.environ.get("LANGTRACE_API_HOST", None)
+        or os.environ.get("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT", None)
+        or os.environ.get("OTEL_EXPORTER_OTLP_ENDPOINT", None)
+        or api_host
+        or LANGTRACE_REMOTE_URL
     )
     check_if_sdk_is_outdated()
     print(Fore.GREEN + "Initializing Langtrace SDK.." + Fore.RESET)
-    print(Fore.WHITE + "⭐ Leave our github a star to stay on top of our updates - https://github.com/Scale3-Labs/langtrace" + Fore.RESET)
+    print(
+        Fore.WHITE
+        + "⭐ Leave our github a star to stay on top of our updates - https://github.com/Scale3-Labs/langtrace"
+        + Fore.RESET
+    )
     sampler = LangtraceSampler(disabled_methods=disable_tracing_for_functions)
     resource = Resource.create(
         attributes={

src/langtrace_python_sdk/version.py

@@ -1 +1 @@
-__version__ = "2.3.1"
+__version__ = "2.3.2"