Skip to content

put custom tags into a single defined attribute #10004

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −1
Draft

put custom tags into a single defined attribute #10004

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
11 changes: 10 additions & 1 deletion ...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 @@ -36,6 +36,7 @@
import java.util.Properties;
import java.util.UUID;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.apache.spark.ExceptionFailure;
import org.apache.spark.SparkConf;
import org.apache.spark.TaskFailedReason;
Expand Down Expand Up @@ -244,10 +245,18 @@ private void initApplicationSpanIfNotInitialized() {
AgentTracer.SpanBuilder builder = buildSparkSpan("spark.application", null);

if (applicationStart != null) {
String customTags =
Config.get().getGlobalTags().entrySet().stream()
.map(e -> e.getKey() + ":" + e.getValue())
.collect(Collectors.joining(","));
Config.get().getGlobalTags().entrySet().stream()
.forEach(e -> builder.withTag("dd.tags." + e.getKey(), e.getValue()));

builder
.withStartTimestamp(applicationStart.time() * 1000)
.withTag("application_name", applicationStart.appName())
.withTag("spark_user", applicationStart.sparkUser());
.withTag("spark_user", applicationStart.sparkUser())
.withTag("run_group_by", customTags);

if (applicationStart.appAttemptId().isDefined()) {
builder.withTag("app_attempt_id", applicationStart.appAttemptId().get());
Expand Down
22 changes: 22 additions & 0 deletions .../testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkListenerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,28 @@ abstract class AbstractSparkListenerTest extends InstrumentationSpecification {
.contains("_dd.ol_intake.process_tags:" + ProcessTags.getTagsForSerialization())
}

def "test all custom tags get propagated into a single attributes of application span"() {
setup:
def customTags = "tagKey1:tagKeyValue1,tagKey2:tagKeyValue2"
injectSysConfig("dd.tags", customTags)
def listener = getTestDatadogSparkListener()
listener.onApplicationStart(applicationStartEvent(1000L))
listener.onApplicationEnd(new SparkListenerApplicationEnd(5000L))

expect:
assertTraces(1) {
trace(1) {
span {
operationName "spark.application"
spanType "spark"
assert span.tags["dd.tags.tagKey1"] == "tagKeyValue1"
assert span.tags["dd.tags.tagKey2"] == "tagKeyValue2"
assert span.tags["run_group_by"] == customTags
}
}
}
}

def "test setupOpenLineage fills circuit breaker config"(
Boolean configEnabled,
String sparkConfCircuitBreakerType,
Expand Down