fix(llmobs): don't set span type to llm if llmobs is disabled (#9421)

NOTE to apm-python reviewers: The only files this PR touches outside of
LLM Observability ownership are snapshot files.

This PR expands on #9417 by only set span.span_type = "llm" if LLMObs is
enabled. This means that we will not even attempt to process the given
span (i.e. set temporary LLMObs tags), which should minimize when the
affect LLMObs code has outside of LLMObs contexts. The majority of this
PR's LOC involves modifying all openai/langchain/bedrock snapshot files
to remove "type":"llm".

Existing tests should cover the reverted functionality.

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

ddtrace/contrib/botocore/services/bedrock.py

@@ -317,16 +317,18 @@ def patched_bedrock_api_call(original_func, instance, args, kwargs, function_var
     params = function_vars.get("params")
     pin = function_vars.get("pin")
     model_provider, model_name = params.get("modelId").split(".")
+    integration = function_vars.get("integration")
+    submit_to_llmobs = integration.llmobs_enabled and "embed" not in model_name
     with core.context_with_data(
         "botocore.patched_bedrock_api_call",
         pin=pin,
         span_name=function_vars.get("trace_operation"),
         service=schematize_service_name("{}.{}".format(pin.service, function_vars.get("endpoint_name"))),
         resource=function_vars.get("operation"),
-        span_type=SpanTypes.LLM if "embed" not in model_name else None,
+        span_type=SpanTypes.LLM if submit_to_llmobs else None,
         call_key="instrumented_bedrock_call",
         call_trace=True,
-        bedrock_integration=function_vars.get("integration"),
+        bedrock_integration=integration,
         params=params,
         model_provider=model_provider,
         model_name=model_name,

ddtrace/llmobs/_integrations/base.py

@@ -124,9 +124,9 @@ def trace(self, pin: Pin, operation_id: str, submit_to_llmobs: bool = False, **k
         # Enable trace metrics for these spans so users can see per-service openai usage in APM.
         span.set_tag(SPAN_MEASURED_KEY)
         self._set_base_span_tags(span, **kwargs)
-        if submit_to_llmobs:
+        if submit_to_llmobs and self.llmobs_enabled:
             span.span_type = SpanTypes.LLM
-            if self.llmobs_enabled and span.get_tag(PROPAGATED_PARENT_ID_KEY) is None:
+            if span.get_tag(PROPAGATED_PARENT_ID_KEY) is None:
                 # For non-distributed traces or spans in the first service of a distributed trace,
                 # The LLMObs parent ID tag is not set at span start time. We need to manually set the parent ID tag now
                 # in these cases to avoid conflicting with the later propagated tags.

tests/snapshots/tests.contrib.botocore.test_bedrock.test_ai21_invoke.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_amazon_invoke.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_amazon_invoke_stream.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_anthropic_invoke.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_anthropic_invoke_stream.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_anthropic_message_invoke.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_anthropic_message_invoke_stream.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_auth_error.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 1,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_cohere_invoke_multi_output.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_cohere_invoke_single_output.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_cohere_invoke_stream_multi_output.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_cohere_invoke_stream_multiple_output.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_cohere_invoke_stream_single_output.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_meta_invoke.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_meta_invoke_stream.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_read_error.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 1,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_read_stream_error.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 1,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.botocore.test_bedrock.test_readlines_error.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 1,
     "meta": {
       "_dd.base_service": "",

tests/snapshots/tests.contrib.langchain.test_langchain.test_ai21_llm_sync.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_llm_sync.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_cohere_math_chain.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",
@@ -36,7 +36,7 @@
        "trace_id": 0,
        "span_id": 2,
        "parent_id": 1,
-       "type": "llm",
+       "type": "",
        "error": 0,
        "meta": {
          "langchain.request.inputs.question": "what is thirteen raised to the .3432 power?",
@@ -60,7 +60,7 @@
           "trace_id": 0,
           "span_id": 3,
           "parent_id": 2,
-          "type": "llm",
+          "type": "",
           "error": 0,
           "meta": {
             "langchain.request.api_key": "...key>",

tests/snapshots/tests.contrib.langchain.test_langchain.test_huggingfacehub_llm_sync.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_call.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_generate.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_stream.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_call_39.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_chat_model_sync_generate_39.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_integration.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",
@@ -51,7 +51,7 @@
        "trace_id": 0,
        "span_id": 2,
        "parent_id": 1,
-       "type": "llm",
+       "type": "",
        "error": 0,
        "meta": {
          "component": "openai",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_async.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_error.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 1,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_stream.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_39.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",

tests/snapshots/tests.contrib.langchain.test_langchain.test_openai_llm_sync_multiple_prompts_39.json

@@ -6,7 +6,7 @@
     "trace_id": 0,
     "span_id": 1,
     "parent_id": 0,
-    "type": "llm",
+    "type": "",
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",