Merge branch 'main' into Ollama_meter

Author: nirga

.cz.toml

@@ -4,7 +4,7 @@ tag_format = "v$version"
 version_scheme = "pep440"
 major_version_zero = true
 update_changelog_on_bump = true
-version = "0.38.10"
+version = "0.38.12"
 version_files = [
     "packages/opentelemetry-instrumentation-groq/pyproject.toml:^version",
     "packages/opentelemetry-instrumentation-groq/opentelemetry/instrumentation/groq/version.py",

CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.38.12 (2025-03-07)
+
+### Fix
+
+- **sdk**: client shouldn't be initialized if destination is not traceloop (#2754)
+
+## v0.38.11 (2025-03-06)
+
+### Fix
+
+- **sdk**: When tracing task with no `name` provided , use qualified name instaed of name (#2743)
+
 ## v0.38.10 (2025-03-05)
 
 ### Fix

packages/opentelemetry-instrumentation-alephalpha/opentelemetry/instrumentation/alephalpha/version.py

@@ -1 +1 @@
-__version__ = "0.38.10"
+__version__ = "0.38.12"

packages/opentelemetry-instrumentation-alephalpha/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-alephalpha"
-version = "0.38.10"
+version = "0.38.12"
 description = "OpenTelemetry Aleph Alpha instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-anthropic/opentelemetry/instrumentation/anthropic/version.py

@@ -1 +1 @@
-__version__ = "0.38.10"
+__version__ = "0.38.12"

packages/opentelemetry-instrumentation-anthropic/pyproject.toml

@@ -8,7 +8,7 @@ show_missing = true
 
 [tool.poetry]
 name = "opentelemetry-instrumentation-anthropic"
-version = "0.38.10"
+version = "0.38.12"
 description = "OpenTelemetry Anthropic instrumentation"
 authors = [
   "Gal Kleinman <[email protected]>",

packages/opentelemetry-instrumentation-bedrock/opentelemetry/instrumentation/bedrock/__init__.py

@@ -197,8 +197,13 @@ def _handle_stream_call(span, kwargs, response, metric_params):
     @dont_throw
     def stream_done(response_body):
         request_body = json.loads(kwargs.get("body"))
+        modelId = kwargs.get("modelId")
 
-        (vendor, model) = kwargs.get("modelId").split(".")
+        if modelId is not None and "." in modelId:
+            (vendor, model) = modelId.split(".")
+        else:
+            vendor = "imported_model"
+            model = kwargs.get("modelId")
 
         metric_params.vendor = vendor
         metric_params.model = model
@@ -233,6 +238,8 @@ def stream_done(response_body):
             _set_amazon_span_attributes(
                 span, request_body, response_body, metric_params
             )
+        elif vendor == "imported_model":
+            _set_imported_model_span_attributes(span, request_body, response_body, metric_params)
 
         span.end()
 
@@ -246,9 +253,13 @@ def _handle_call(span, kwargs, response, metric_params):
     )
     request_body = json.loads(kwargs.get("body"))
     response_body = json.loads(response.get("body").read())
+    modelId = kwargs.get("modelId")
 
-    (vendor, model) = kwargs.get("modelId").split(".")
-
+    if modelId is not None and "." in modelId:
+        (vendor, model) = modelId.split(".")
+    else:
+        vendor = "imported_model"
+        model = kwargs.get("modelId")
     metric_params.vendor = vendor
     metric_params.model = model
     metric_params.is_stream = False
@@ -278,6 +289,8 @@ def _handle_call(span, kwargs, response, metric_params):
         _set_llama_span_attributes(span, request_body, response_body, metric_params)
     elif vendor == "amazon":
         _set_amazon_span_attributes(span, request_body, response_body, metric_params)
+    elif vendor == "imported_model":
+        _set_imported_model_span_attributes(span, request_body, response_body, metric_params)
 
 
 def _record_usage_to_span(span, prompt_tokens, completion_tokens, metric_params):
@@ -636,6 +649,40 @@ def _set_amazon_span_attributes(span, request_body, response_body, metric_params
             )
 
 
+def _set_imported_model_span_attributes(span, request_body, response_body, metric_params):
+    _set_span_attribute(
+        span, SpanAttributes.LLM_REQUEST_TYPE, LLMRequestTypeValues.COMPLETION.value
+    )
+    _set_span_attribute(
+        span, SpanAttributes.LLM_REQUEST_TOP_P, request_body.get("topP")
+    )
+    _set_span_attribute(
+        span, SpanAttributes.LLM_REQUEST_TEMPERATURE, request_body.get("temperature")
+    )
+    _set_span_attribute(
+        span, SpanAttributes.LLM_REQUEST_MAX_TOKENS, request_body.get("max_tokens")
+    )
+    prompt_tokens = (
+        response_body.get("usage", {}).get("prompt_tokens")
+        if response_body.get("usage", {}).get("prompt_tokens") is not None
+        else response_body.get("prompt_token_count")
+    )
+    completion_tokens = response_body.get("usage", {}).get(
+        "completion_tokens"
+    ) or response_body.get("generation_token_count")
+
+    _record_usage_to_span(span, prompt_tokens, completion_tokens, metric_params, )
+
+    if should_send_prompts():
+        _set_span_attribute(
+            span, f"{SpanAttributes.LLM_PROMPTS}.0.content", request_body.get("prompt")
+        )
+        _set_span_attribute(
+                span, f"{SpanAttributes.LLM_COMPLETIONS}.0.content",
+                response_body.get("generation"),
+            )
+
+
 def _create_metrics(meter: Meter):
     token_histogram = meter.create_histogram(
         name=Meters.LLM_TOKEN_USAGE,

packages/opentelemetry-instrumentation-bedrock/opentelemetry/instrumentation/bedrock/version.py

@@ -1 +1 @@
-__version__ = "0.38.10"
+__version__ = "0.38.12"