Skip to content

Do not set the hibernate or datanucleus span service name when disabled #8727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2025
+8 −3
Merged

Do not set the hibernate or datanucleus span service name when disabled #8727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...cleus-4/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand All @@ -36,7 +38,7 @@ protected CharSequence component() {

@Override
protected String service() {
return "datanucleus";
return SERVICE_NAME;
}

@Override
Expand Down
5 changes: 4 additions & 1 deletion ...n/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down