Use AZURE_OPENAI_MODEL_NAME and clean capture defaults

Author: nagkumar91

lab/5-Observability/1-OpenAIAgents/weekend_planner.ipynb

@@ -27,6 +27,7 @@
     "- `AZURE_OPENAI_API_KEY`\n",
     "- `AZURE_OPENAI_ENDPOINT`\n",
     "- `AZURE_OPENAI_API_VERSION`\n",
+    "- `AZURE_OPENAI_MODEL_NAME`\n",
     "- `AZURE_AI_FOUNDRY_NAME`\n",
     "- `AZURE_AOAI_ACCOUNT`\n",
     "- `AZURE_SUBSCRIPTION_ID`\n",
@@ -86,7 +87,7 @@
     "LOGGER = logging.getLogger(\"weekend_planner\")\n",
     "LOGGER.setLevel(logging.INFO)\n",
     "\n",
-    "MODEL_NAME = os.environ.get(\"AZURE_AI_FOUNDRY_NAME\") or \"gpt-4o-mini\"\n",
+    "MODEL_NAME = os.environ.get(\"AZURE_OPENAI_MODEL_NAME\") or \"gpt-4o-mini\"\n",
     "SERVICE_VERSION = \"1.0.0\"\n"
    ]
   },
@@ -118,15 +119,10 @@
     "    \"\"\"Enable GenAI capture toggles required by the instrumentation layer.\"\"\"\n",
     "\n",
     "    capture_defaults = {\n",
-    "        \"OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_CONTENT\": \"true\",\n",
-    "        \"OTEL_INSTRUMENTATION_OPENAI_AGENTS_CAPTURE_METRICS\": \"true\",\n",
     "        \"OTEL_GENAI_CAPTURE_MESSAGES\": \"true\",\n",
     "        \"OTEL_GENAI_CAPTURE_SYSTEM_INSTRUCTIONS\": \"true\",\n",
     "        \"OTEL_GENAI_CAPTURE_TOOL_DEFINITIONS\": \"true\",\n",
     "        \"OTEL_GENAI_EMIT_OPERATION_DETAILS\": \"true\",\n",
-    "        \"OTEL_GENAI_AGENT_NAME\": \"Weekend Planner Agent\",\n",
-    "        \"OTEL_GENAI_AGENT_DESCRIPTION\": \"Assistant that plans weekend activities using weather and events data\",\n",
-    "        \"OTEL_GENAI_AGENT_ID\": \"weekend-planner\",\n",
     "        \"OTEL_GENAI_PROVIDER_NAME\": provider,\n",
     "    }\n",
     "    for key, value in capture_defaults.items():\n",
@@ -144,6 +140,7 @@
     "\n",
     "    endpoint = os.environ[\"AZURE_OPENAI_ENDPOINT\"].rstrip(\"/\")\n",
     "    api_version = os.environ.get(\"AZURE_OPENAI_API_VERSION\", \"2024-05-01-preview\")\n",
+    "    model_name = os.environ.get(\"AZURE_OPENAI_MODEL_NAME\") or \"gpt-4o-mini\"\n",
     "    api_key = os.environ[\"AZURE_OPENAI_API_KEY\"]\n",
     "\n",
     "    def _build_client() -> openai.AsyncAzureOpenAI:\n",
@@ -155,7 +152,7 @@
     "\n",
     "    return _ApiConfig(\n",
     "        build_client=_build_client,\n",
-    "        model_name=MODEL_NAME,\n",
+    "        model_name=model_name,\n",
     "        base_url=endpoint,\n",
     "        provider=\"azure.ai.openai\",\n",
     "    )\n",

lab/5-Observability/2-LangChain/weekend_planner.ipynb

@@ -24,6 +24,7 @@
     "- `AZURE_OPENAI_API_KEY`\n",
     "- `AZURE_OPENAI_ENDPOINT`\n",
     "- `AZURE_OPENAI_API_VERSION`\n",
+    "- `AZURE_OPENAI_MODEL_NAME`\n",
     "- `AZURE_AI_FOUNDRY_NAME`\n",
     "- `AZURE_AOAI_ACCOUNT`\n",
     "- `AZURE_SUBSCRIPTION_ID`\n",
@@ -72,7 +73,7 @@
     "LOGGER = logging.getLogger(\"weekend_planner\")\n",
     "LOGGER.setLevel(logging.INFO)\n",
     "\n",
-    "MODEL_DEPLOYMENT = os.environ.get(\"AZURE_AI_FOUNDRY_NAME\") or \"gpt-4o-mini\"\n"
+    "MODEL_NAME = os.environ.get(\"AZURE_OPENAI_MODEL_NAME\") or \"gpt-4o-mini\"\n"
    ]
   },
   {
@@ -99,9 +100,9 @@
     "    azure_endpoint=os.environ[\"AZURE_OPENAI_ENDPOINT\"],\n",
     "    api_key=os.environ[\"AZURE_OPENAI_API_KEY\"],\n",
     "    api_version=os.environ.get(\"AZURE_OPENAI_API_VERSION\", \"2024-05-01-preview\"),\n",
-    "    azure_deployment=MODEL_DEPLOYMENT,\n",
+    "    azure_deployment=MODEL_NAME,\n",
     ")\n",
-    "print(\"Model configured with deployment:\", MODEL_DEPLOYMENT)\n"
+    "print(\"Model configured with model:\", MODEL_NAME)\n"
    ]
   },
   {

lab/5-Observability/3-LangGraph/music_router.ipynb

@@ -24,6 +24,7 @@
     "- `AZURE_OPENAI_API_KEY`\n",
     "- `AZURE_OPENAI_ENDPOINT`\n",
     "- `AZURE_OPENAI_API_VERSION`\n",
+    "- `AZURE_OPENAI_MODEL_NAME`\n",
     "- `AZURE_AI_FOUNDRY_NAME`\n",
     "- `AZURE_AOAI_ACCOUNT`\n",
     "- `AZURE_SUBSCRIPTION_ID`\n",
@@ -66,7 +67,7 @@
     "\n",
     "load_dotenv(override=True)\n",
     "\n",
-    "MODEL_DEPLOYMENT = os.environ.get(\"AZURE_AI_FOUNDRY_NAME\") or \"gpt-4o-mini\"\n"
+    "MODEL_NAME = os.environ.get(\"AZURE_OPENAI_MODEL_NAME\") or \"gpt-4o-mini\"\n"
    ]
   },
   {
@@ -93,9 +94,9 @@
     "    azure_endpoint=os.environ[\"AZURE_OPENAI_ENDPOINT\"],\n",
     "    api_key=os.environ[\"AZURE_OPENAI_API_KEY\"],\n",
     "    api_version=os.environ.get(\"AZURE_OPENAI_API_VERSION\", \"2024-05-01-preview\"),\n",
-    "    azure_deployment=MODEL_DEPLOYMENT,\n",
+    "    azure_deployment=MODEL_NAME,\n",
     ")\n",
-    "print(\"Model ready with deployment:\", MODEL_DEPLOYMENT)\n"
+    "print(\"Model ready with model:\", MODEL_NAME)\n"
    ]
   },
   {

lab/5-Observability/README.md

@@ -32,7 +32,7 @@ Both packages automatically apply the GenAI semantic conventions and expose togg
 
 ## Running the Samples
 
-1. Export the following environment variables before running any notebook (set unused values to an empty string): `AZURE_OPENAI_API_KEY`, `AZURE_OPENAI_ENDPOINT`, `AZURE_OPENAI_API_VERSION`, `AZURE_AI_FOUNDRY_NAME`, `AZURE_AOAI_ACCOUNT`, `AZURE_SUBSCRIPTION_ID`, `AZURE_RESOURCE_GROUP`, `AZURE_AISEARCH_ENDPOINT`, `AZURE_AISEARCH_INDEX`, `AZURE_AISEARCH_RESOURCE_GROUP`, and `APPLICATION_INSIGHTS_CONNECTION_STRING`.
+1. Export the following environment variables before running any notebook (set unused values to an empty string): `AZURE_OPENAI_API_KEY`, `AZURE_OPENAI_ENDPOINT`, `AZURE_OPENAI_API_VERSION`, `AZURE_OPENAI_MODEL_NAME`, `AZURE_AI_FOUNDRY_NAME`, `AZURE_AOAI_ACCOUNT`, `AZURE_SUBSCRIPTION_ID`, `AZURE_RESOURCE_GROUP`, `AZURE_AISEARCH_ENDPOINT`, `AZURE_AISEARCH_INDEX`, `AZURE_AISEARCH_RESOURCE_GROUP`, and `APPLICATION_INSIGHTS_CONNECTION_STRING`.
 1. Export an `APPLICATION_INSIGHTS_CONNECTION_STRING` if you want spans to flow into Azure Monitor; otherwise the scripts fall back to console exporters so you can inspect payloads locally.
 1. Open any notebook (for example, `lab/5-Observability/1-OpenAIAgents/weekend_planner.ipynb`) and run the cells in order. Observe the emitted spans and confirm that the GenAI attributes align with the semantic conventions.