Skip to content

Source dd Trace from dd artifact and update sfx to last possible. #12834

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 2 commits into from
Dec 7, 2024
Merged

Source dd Trace from dd artifact and update sfx to last possible. #12834

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
986df95
source dd Trace from dd artifact and update sfx to last possible.
breedx-splk Dec 4, 2024
2569fc6
Update instrumentation/external-annotations/javaagent/src/test/java/i…
breedx-splk Dec 7, 2024
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
3 changes: 2 additions & 1 deletion instrumentation/external-annotations/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ dependencies {
testImplementation("io.opentracing.contrib.dropwizard:dropwizard-opentracing:0.2.2") {
isTransitive = false
}
testImplementation("com.signalfx.public:signalfx-trace-api:0.48.0-sfx1")
testImplementation("com.datadoghq:dd-trace-api:1.43.0")
testImplementation("com.signalfx.public:signalfx-trace-api:0.48.0-sfx8")
// Old and new versions of kamon use different packages for Trace annotation
testImplementation("io.kamon:kamon-annotation_2.11:0.6.7") {
isTransitive = false
Expand Down
1 change: 1 addition & 0 deletions ...c/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/SayTracedHello.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public String newrelic() {
return "hello!";
}

// End of life -- never use this annotation in new development
@com.signalfx.tracing.api.Trace
public String signalfx() {
Span.current().setAttribute("providerAttr", "SignalFx");
Expand Down
Loading