From 2afb85707d66a7df6373abb50bba8c987b83606c Mon Sep 17 00:00:00 2001 From: Yury Gribkov Date: Thu, 24 Apr 2025 14:23:40 -0700 Subject: [PATCH] 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` --- .../instrumentation/datanucleus/DatanucleusDecorator.java | 6 ++++-- .../trace/instrumentation/hibernate/HibernateDecorator.java | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java b/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java index 8bd78828aa6..bbd970de659 100644 --- a/dd-java-agent/instrumentation/datanucleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java +++ b/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 diff --git a/dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java b/dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java index fef713a295c..6c7aa6b9798 100644 --- a/dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java +++ b/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