extract model_provider from base_url

Author: ygree

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionDecorator.java

@@ -31,7 +31,6 @@ public void withChatCompletionCreateParams(
       AgentSpan span, ChatCompletionCreateParams params, boolean stream) {
     span.setResourceName(CHAT_COMPLETIONS_CREATE);
     span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/chat/completions");
-    span.setTag(CommonTags.OPENAI_REQUEST_METHOD, "POST");
     if (!llmObsEnabled) {
       return;
     }
@@ -99,7 +98,6 @@ public void withChatCompletion(AgentSpan span, ChatCompletion completion) {
     String modelName = completion.model();
     span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
     span.setTag(CommonTags.MODEL_NAME, modelName);
-    span.setTag(CommonTags.MODEL_PROVIDER, "openai");
 
     List<LLMObs.LLMMessage> output =
         completion.choices().stream()

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionDecorator.java

@@ -23,7 +23,6 @@ public class CompletionDecorator {
   public void withCompletionCreateParams(AgentSpan span, CompletionCreateParams params) {
     span.setResourceName(COMPLETIONS_CREATE);
     span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/completions");
-    span.setTag(CommonTags.OPENAI_REQUEST_METHOD, "POST");
     if (!llmObsEnabled) {
       return;
     }
@@ -69,7 +68,6 @@ public void withCompletion(AgentSpan span, Completion completion) {
     String modelName = completion.model();
     span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
     span.setTag(CommonTags.MODEL_NAME, modelName);
-    span.setTag(CommonTags.MODEL_PROVIDER, "openai");
 
     List<LLMObs.LLMMessage> output =
         completion.choices().stream()
@@ -100,7 +98,6 @@ public void withCompletions(AgentSpan span, List<Completion> completions) {
     String modelName = firstCompletion.model();
     span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
     span.setTag(CommonTags.MODEL_NAME, modelName);
-    span.setTag(CommonTags.MODEL_PROVIDER, "openai");
 
     Map<Long, StringBuilder> textByChoiceIndex = new HashMap<>();
     for (Completion completion : completions) {

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingDecorator.java

@@ -25,7 +25,6 @@ public class EmbeddingDecorator {
   public void withEmbeddingCreateParams(AgentSpan span, EmbeddingCreateParams params) {
     span.setResourceName(EMBEDDINGS_CREATE);
     span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/embeddings");
-    span.setTag(CommonTags.OPENAI_REQUEST_METHOD, "POST");
     if (!llmObsEnabled) {
       return;
     }
@@ -67,7 +66,6 @@ public void withCreateEmbeddingResponse(AgentSpan span, CreateEmbeddingResponse
     String modelName = response.model();
     span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
     span.setTag(CommonTags.MODEL_NAME, modelName);
-    span.setTag(CommonTags.MODEL_PROVIDER, "openai");
 
     if (!response.data().isEmpty()) {
       int embeddingCount = response.data().size();

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/OpenAiDecorator.java

@@ -41,10 +41,22 @@ public class OpenAiDecorator extends ClientDecorator {
   public AgentSpan startSpan(ClientOptions clientOptions) {
     AgentSpan span = AgentTracer.startSpan(INSTRUMENTATION_NAME, SPAN_NAME);
     afterStart(span);
-    span.setTag(CommonTags.OPENAI_API_BASE, clientOptions.baseUrl());
+    String baseUrl = clientOptions.baseUrl();
+    span.setTag(CommonTags.OPENAI_API_BASE, baseUrl);
+    span.setTag(CommonTags.MODEL_PROVIDER, detectProvider(baseUrl));
+    span.setTag(CommonTags.OPENAI_REQUEST_METHOD, "POST");
     return span;
   }
 
+  private String detectProvider(String baseUrl) {
+    if (baseUrl != null) {
+      String lower = baseUrl.toLowerCase();
+      if (lower.contains("azure")) return "azure_openai";
+      if (lower.contains("deepseek")) return "deepseek";
+    }
+    return "openai";
+  }
+
   public void finishSpan(AgentSpan span, Throwable err) {
     try {
       if (err != null) {

dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseDecorator.java

@@ -37,7 +37,6 @@ public class ResponseDecorator {
   public void withResponseCreateParams(AgentSpan span, ResponseCreateParams params) {
     span.setResourceName(RESPONSES_CREATE);
     span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/responses");
-    span.setTag(CommonTags.OPENAI_REQUEST_METHOD, "POST");
     if (!llmObsEnabled) {
       return;
     }
@@ -396,7 +395,6 @@ private void withResponse(AgentSpan span, Response response, boolean stream) {
     String modelName = extractResponseModel(response._model());
     span.setTag(CommonTags.OPENAI_RESPONSE_MODEL, modelName);
     span.setTag(CommonTags.MODEL_NAME, modelName);
-    span.setTag(CommonTags.MODEL_PROVIDER, "openai");
 
     List<LLMObs.LLMMessage> outputMessages = extractResponseOutputMessages(response.output());
     if (!outputMessages.isEmpty()) {