Do not set the hibernate or datanucleus span service name if dd.trace.remove.integration-service-names.enabled is true or the naming scheme version is v1 (#8727)

Author: ygree

dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java

@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.datanucleus;
 
+import datadog.trace.api.naming.SpanNaming;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
@@ -16,7 +17,8 @@ public class DatanucleusDecorator extends OrmClientDecorator {
   public static final CharSequence DATANUCLEUS_QUERY_DELETE =
       UTF8BytesString.create("datanucleus.query.delete");
   public static final CharSequence JAVA_DATANUCLEUS = UTF8BytesString.create("java-datanucleus");
-
+  private static final String SERVICE_NAME =
+      SpanNaming.instance().namingSchema().database().service("datanucleus");
   public static final DatanucleusDecorator DECORATE = new DatanucleusDecorator();
 
   @Override
@@ -36,7 +38,7 @@ protected CharSequence component() {
 
   @Override
   protected String service() {
-    return "datanucleus";
+    return SERVICE_NAME;
   }
 
   @Override

dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java

@@ -1,5 +1,6 @@
 package datadog.trace.instrumentation.hibernate;
 
+import datadog.trace.api.naming.SpanNaming;
 import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.OrmClientDecorator;
@@ -10,11 +11,13 @@
 
 public class HibernateDecorator extends OrmClientDecorator {
   public static final CharSequence HIBERNATE_SESSION = UTF8BytesString.create("hibernate.session");
+  private static final String SERVICE_NAME =
+      SpanNaming.instance().namingSchema().database().service("hibernate");
   public static final HibernateDecorator DECORATOR = new HibernateDecorator();
 
   @Override
   protected String service() {
-    return "hibernate";
+    return SERVICE_NAME;
   }
 
   @Override