Remove env vars that are not a part of semantic convention

Author: nagkumar91

instrumentation-genai/opentelemetry-instrumentation-openai-agents/README.rst

@@ -1,5 +1,5 @@
 OpenTelemetry OpenAI Agents Instrumentation
-==========================================
+===========================================
 
 |pypi|
 
@@ -44,12 +44,10 @@ API
 The `opentelemetry-instrumentation-openai-agents` package provides automatic instrumentation for the OpenAI Agents framework.
 
 Configuration
--------------
+--------------
 
-The following environment variables can be used to configure the instrumentation:
-
-- ``OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_CONTENT``: Set to ``true`` to capture the content of the requests and responses. Default is ``false``.
-- ``OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_METRICS``: Set to ``true`` to capture metrics. Default is ``true``.
+This instrumentation captures content, metrics, and events by default with no additional configuration required.
+If you are installing and setting up this tracing library, the assumption is you want full capture.
 
 References
 ----------

instrumentation-genai/opentelemetry-instrumentation-openai-agents/src/opentelemetry/instrumentation/openai_agents/__init__.py

@@ -48,12 +48,8 @@
 Configuration
 -------------
 
-Environment variables:
-
-- ``OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_CONTENT``: ``true`` to
-    capture request/response content (default ``false``).
-- ``OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_METRICS``: ``true`` to
-    capture metrics (default ``true``).
+Content, metrics, and events are captured by default with no environment configuration.
+This library assumes full capture is desired when installed.
 """
 
 import logging

instrumentation-genai/opentelemetry-instrumentation-openai-agents/src/opentelemetry/instrumentation/openai_agents/events.py

@@ -7,24 +7,18 @@
 - gen_ai.evaluation.result (helper only; actual evaluation may happen
   externally – e.g. offline evaluator script)
 
-Environment toggles:
-- OTEL_GENAI_EMIT_OPERATION_DETAILS (default: true)
-- OTEL_GENAI_EMIT_EVALUATION_RESULTS (default: true)
+All GenAI events are emitted by default.
 """
 
 from __future__ import annotations
 
-import os
 from typing import Any, Dict, Optional
 
 from opentelemetry._events import Event
 
 OP_DETAILS_EVENT = "gen_ai.client.inference.operation.details"
 EVAL_RESULT_EVENT = "gen_ai.evaluation.result"
 
-_OP_DETAILS_ENABLED_ENV = "OTEL_GENAI_EMIT_OPERATION_DETAILS"
-_EVAL_RESULTS_ENABLED_ENV = "OTEL_GENAI_EMIT_EVALUATION_RESULTS"
-
 # Attribute allowlist subset to avoid dumping huge blobs blindly.
 # (Large content already controlled by capture-content env var.)
 _OPERATION_DETAILS_CORE_KEYS = {
@@ -45,13 +39,6 @@
 _MAX_VALUE_LEN = 4000  # defensive truncation
 
 
-def _enabled(env_name: str, default_true: bool = True) -> bool:
-    raw = os.getenv(env_name)
-    if raw is None:
-        return default_true
-    return raw.lower() not in {"0", "false", "no"}
-
-
 def emit_operation_details_event(
     event_logger,
     span_attributes: Dict[str, Any],
@@ -66,8 +53,7 @@ def emit_operation_details_event(
     """
     if not event_logger:
         return
-    if not _enabled(_OP_DETAILS_ENABLED_ENV, True):
-        return
+    # Always enabled
 
     attrs: Dict[str, Any] = {}
     for k in _OPERATION_DETAILS_CORE_KEYS:
@@ -114,8 +100,7 @@ def emit_evaluation_result_event(
     """
     if not event_logger:
         return
-    if not _enabled(_EVAL_RESULTS_ENABLED_ENV, True):
-        return
+    # Always enabled
 
     attrs: Dict[str, Any] = {"gen_ai.evaluation.name": name}
     if score_value is not None:

instrumentation-genai/opentelemetry-instrumentation-openai-agents/src/opentelemetry/instrumentation/openai_agents/genai_semantic_processor.py

@@ -98,11 +98,8 @@
 
 # Import utilities and event helpers
 from .utils import (
-    is_content_enabled,
-    is_metrics_enabled,
     normalize_output_type,
     normalize_provider,
-    should_emit_operation_details,
     validate_tool_type,
 )
 
@@ -260,26 +257,16 @@ def __init__(
         self._otel_spans: dict[str, OtelSpan] = {}
         self._tokens: dict[str, object] = {}
 
-        # Metrics configuration
-        self._metrics_enabled = is_metrics_enabled()
+        # Metrics configuration (always enabled)
+        self._metrics_enabled = True
         self._meter = None
         self._duration_histogram: Optional[Histogram] = None
         self._token_usage_histogram: Optional[Histogram] = None
 
-        # Configuration for opt-in attributes
-        self._capture_system_instructions = (
-            os.getenv(
-                "OTEL_GENAI_CAPTURE_SYSTEM_INSTRUCTIONS", "false"
-            ).lower()
-            == "true"
-        )
-        self._capture_messages = (
-            os.getenv("OTEL_GENAI_CAPTURE_MESSAGES", "false").lower() == "true"
-        )
-        self._capture_tool_definitions = (
-            os.getenv("OTEL_GENAI_CAPTURE_TOOL_DEFINITIONS", "false").lower()
-            == "true"
-        )
+        # Configuration for attribute capture (always enabled)
+        self._capture_system_instructions = True
+        self._capture_messages = True
+        self._capture_tool_definitions = True
 
         # Initialize metrics if enabled
         if self._metrics_enabled:
@@ -577,7 +564,7 @@ def on_span_end(self, span: Span[Any]) -> None:
                 attributes[key] = value
 
             # Emit operation details event if configured
-            if should_emit_operation_details() and self._event_logger:
+            if self._event_logger:
                 emit_operation_details_event(
                     self._event_logger, attributes, otel_span
                 )
@@ -758,9 +745,9 @@ def _get_attributes_from_generation_span_data(
                 if k in mc and mc[k] is not None:
                     yield attr, mc[k]
 
-        # Sensitive data (opt-in)
-        if self.include_sensitive_data and is_content_enabled():
-            # Input messages (opt-in)
+        # Sensitive data capture
+        if self.include_sensitive_data:
+            # Input messages
             if self._capture_messages and span_data.input:
                 yield GEN_AI_INPUT_MESSAGES, safe_json_dumps(span_data.input)
                 if self.emit_legacy:
@@ -769,7 +756,7 @@ def _get_attributes_from_generation_span_data(
                         safe_json_dumps(span_data.input),
                     )
 
-            # System instructions (opt-in)
+            # System instructions
             if self._capture_system_instructions and span_data.input:
                 sys_instr = self._collect_system_instructions(span_data.input)
                 if sys_instr:
@@ -778,7 +765,7 @@ def _get_attributes_from_generation_span_data(
                         safe_json_dumps(sys_instr),
                     )
 
-            # Output messages (opt-in)
+            # Output messages
             if self._capture_messages and span_data.output:
                 yield GEN_AI_OUTPUT_MESSAGES, safe_json_dumps(span_data.output)
                 if self.emit_legacy:
@@ -817,7 +804,7 @@ def _get_attributes_from_agent_span_data(
         if hasattr(span_data, "conversation_id") and span_data.conversation_id:
             yield GEN_AI_CONVERSATION_ID, span_data.conversation_id
 
-        # Agent definitions (opt-in)
+        # Agent definitions
         if self._capture_tool_definitions and hasattr(
             span_data, "agent_definitions"
         ):
@@ -826,7 +813,7 @@ def _get_attributes_from_agent_span_data(
                 safe_json_dumps(span_data.agent_definitions),
             )
 
-        # System instructions from agent definitions (opt-in)
+        # System instructions from agent definitions
         if self._capture_system_instructions and hasattr(
             span_data, "agent_definitions"
         ):
@@ -876,7 +863,7 @@ def _get_attributes_from_function_span_data(
         if hasattr(span_data, "description") and span_data.description:
             yield GEN_AI_TOOL_DESCRIPTION, span_data.description
 
-        # Tool definitions (opt-in)
+        # Tool definitions
         if self._capture_tool_definitions and hasattr(
             span_data, "tool_definitions"
         ):
@@ -885,8 +872,8 @@ def _get_attributes_from_function_span_data(
                 safe_json_dumps(span_data.tool_definitions),
             )
 
-        # Tool input/output (sensitive, opt-in via include_sensitive_data)
-        if self.include_sensitive_data and is_content_enabled():
+        # Tool input/output (sensitive)
+        if self.include_sensitive_data:
             if span_data.input is not None:
                 arg_val = (
                     safe_json_dumps(span_data.input)
@@ -967,8 +954,8 @@ def _get_attributes_from_response_span_data(
                 ):
                     yield GEN_AI_USAGE_TOTAL_TOKENS, usage.total_tokens
 
-        # Input/output messages (opt-in)
-        if self.include_sensitive_data and is_content_enabled():
+        # Input/output messages
+        if self.include_sensitive_data:
             # Input messages
             if self._capture_messages and span_data.input:
                 yield GEN_AI_INPUT_MESSAGES, safe_json_dumps(span_data.input)
@@ -1032,8 +1019,8 @@ def _get_attributes_from_transcription_span_data(
         if hasattr(span_data, "format") and span_data.format:
             yield "gen_ai.audio.input.format", span_data.format
 
-        # Transcript (sensitive, opt-in)
-        if self.include_sensitive_data and is_content_enabled():
+        # Transcript (sensitive)
+        if self.include_sensitive_data:
             if self._capture_messages and hasattr(span_data, "transcript"):
                 yield "gen_ai.transcription.text", span_data.transcript
 
@@ -1057,8 +1044,8 @@ def _get_attributes_from_speech_span_data(
         if hasattr(span_data, "format") and span_data.format:
             yield "gen_ai.audio.output.format", span_data.format
 
-        # Input text (sensitive, opt-in)
-        if self.include_sensitive_data and is_content_enabled():
+        # Input text (sensitive)
+        if self.include_sensitive_data:
             if self._capture_messages and hasattr(span_data, "input_text"):
                 yield "gen_ai.speech.input_text", span_data.input_text
 

instrumentation-genai/opentelemetry-instrumentation-openai-agents/src/opentelemetry/instrumentation/openai_agents/utils.py

@@ -12,37 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from os import environ
 from typing import Optional
 
 from .constants import GenAIOutputType, GenAIProvider, GenAIToolType
 
-_EMIT_OP_DETAILS_ENV = "OTEL_GENAI_EMIT_OPERATION_DETAILS"
-
-
-OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_CONTENT = (
-    "OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_CONTENT"
-)
-OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_METRICS = (
-    "OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_METRICS"
-)
-
-
-def is_content_enabled() -> bool:
-    """Check if content capture is enabled."""
-    capture_content = environ.get(
-        OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_CONTENT, "false"
-    )
-    return capture_content.lower() == "true"
-
-
-def is_metrics_enabled() -> bool:
-    """Check if metrics capture is enabled."""
-    capture_metrics = environ.get(
-        OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_METRICS, "true"
-    )
-    return capture_metrics.lower() == "true"
-
 
 def get_agent_operation_name(operation: str) -> str:
     """Get the operation name for agent operations."""
@@ -102,9 +75,3 @@ def normalize_output_type(output_type: Optional[str]) -> str:
     }:
         return o
     return GenAIOutputType.TEXT  # default for unknown
-
-
-def should_emit_operation_details() -> bool:
-    """Check if operation details event should be emitted."""
-    raw = environ.get(_EMIT_OP_DETAILS_ENV, "true")
-    return raw.lower() not in {"0", "false", "no"}