Skip to content

Duplicate service name in meta so it's not truncated in spark integration #10063

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

Open
aboitreaud wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Duplicate service name in meta so it's not truncated in spark integration #10063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10fc8e4
Duplicate service name in meta so it's not truncated
aboitreaud Dec 2, 2025
8ee8611
rename attr
aboitreaud Dec 5, 2025
fa015b9
service_name attr in test
aboitreaud Dec 5, 2025
4a4cea5
fix test
aboitreaud Dec 5, 2025
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
1 change: 1 addition & 0 deletions ...spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,7 @@ private AgentTracer.SpanBuilder buildSparkSpan(String spanName, Properties prope
builder.withServiceName(databricksServiceName);
} else if (sparkServiceName != null) {
builder.withServiceName(sparkServiceName);
builder.withTag("service_name", sparkServiceName);
}

addPropertiesTags(builder, properties);
Expand Down
22 changes: 13 additions & 9 deletions ...park/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ abstract class AbstractSparkTest extends InstrumentationSpecification {
null | null | null | "(?!.*databricks).*"
}

def "set the proper spark service name"(String ddService, boolean sparkAppNameAsService, String appName, boolean isRunningOnDatabricks, String expectedService) {
def "set the proper spark service name"(String ddService, boolean sparkAppNameAsService, String appName, boolean isRunningOnDatabricks, String expectedService, String expectedServiceNameTag) {
setup:
if (ddService != null) {
injectSysConfig("dd.service", ddService)
Expand Down Expand Up @@ -668,35 +668,39 @@ abstract class AbstractSparkTest extends InstrumentationSpecification {
operationName "spark.application"
spanType "spark"
assert span.serviceName ==~ expectedService
assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag
}
}
span {
operationName "spark.sql"
spanType "spark"
assert span.serviceName ==~ expectedService
assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag
}
span {
operationName "spark.job"
spanType "spark"
assert span.serviceName ==~ expectedService
assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag
}
span {
operationName "spark.stage"
spanType "spark"
assert span.serviceName ==~ expectedService
assert expectedServiceNameTag == null ? span.tags["service_name"] == null : span.tags["service_name"] ==~ expectedServiceNameTag
}
}
}

where:
ddService | sparkAppNameAsService | appName | isRunningOnDatabricks | expectedService
"foobar" | true | "some_app" | false | "(?!.*some_app).*"
"spark" | true | "some_app" | false | "some_app"
"hadoop" | true | "some_app" | false | "some_app"
null | true | "some_app" | true | "(?!.*some_app).*"
null | true | "some_app" | false | "some_app"
null | false | "some_app" | false | "(?!.*some_app).*"
null | true | null | false | "(?!.*some_app).*"
ddService | sparkAppNameAsService | appName | isRunningOnDatabricks | expectedService | expectedServiceNameTag
"foobar" | true | "some_app" | false | "(?!.*some_app).*" | null
"spark" | true | "some_app" | false | "some_app" | "some_app"
"hadoop" | true | "some_app" | false | "some_app" | "some_app"
null | true | "some_app" | true | "(?!.*some_app).*" | null
null | true | "some_app" | false | "some_app" | "some_app"
null | false | "some_app" | false | "(?!.*some_app).*" | null
null | true | null | false | "(?!.*some_app).*" | ".+"
}


Expand Down