remaining merge conflicts

Author: Nayeem Kamal

dd-java-agent/agent-llmobs/build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 
 plugins {
-  id 'com.gradleup.shadow'
+  id 'com.github.johnrengelman.shadow'
   id 'java-test-fixtures'
 }
 

dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObs.java

@@ -88,7 +88,7 @@ public String getType() {
       return type;
     }
 
-    public String gettoolId() {
+    public String getToolId() {
       return toolId;
     }