8000 Introducing an internal integration name by amarziali · Pull Request #8708 · DataDog/dd-trace-java · GitHub
[go: up one dir, main page]
Skip to content

Introducing an internal integration name #8708

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 21 commits into from
May 6, 2025
Merged

Introducing an internal integration name #8708

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
03b8714
Introducing an internal instrumentation component name
amarziali Apr 18, 2025
9582748
fix tests
amarziali Apr 30, 2025
c7f3405
fix ci viz tests
amarziali Apr 30, 2025
df41a18
Change tag name and use otel instead opentelemetry
amarziali Apr 30, 2025
a6543b1
Add assertions for instrumentation which changes component tag
amarziali Apr 30, 2025
28d43aa
fix dropwizard tests
amarziali Apr 30, 2025
8cc698b
Fix latest finatra tests
amarziali Apr 30, 2025
4e97f82
Add instrumentation tag to netty connect spans
amarziali Apr 30, 2025
0b4f195
Add instrumentation tag to dropwizard view spans
amarziali Apr 30, 2025
4498daf
fix tests
amarziali May 4, 2025
f57e954
fix ci viz smoke tests
amarziali May 4, 2025
faec1e8
Rename to instrumentationName
amarziali May 6, 2025
c3fea34
Update dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/…
amarziali May 6, 2025
78d86dc
Update dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/In…
amarziali May 6, 2025
a1ebfae
Update dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java
amarziali May 6, 2025
7282922
codenarc
amarziali May 6, 2025
6efd8c4
cleanup httpservertest
amarzia 10000 li May 6, 2025
e072b5f
Update dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/In…
amarziali May 6, 2025
9c85743
change system test commit
amarziali May 6, 2025
4edb5dd
rename
amarziali May 6, 2025
73ecd4a
update system test commit
amarziali May 6, 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
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
@amarziali
amarziali committed May 6, 2025
commit 9582748d99e9d034fda4ff049ecbba9c49bf1bd8
9 changes: 7 additions & 2 deletions ...ibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@ package datadog.trace.civisibility.decorator
import datadog.trace.api.DDTags
import datadog.trace.api.sampling.PrioritySampling
import datadog.trace.bootstrap.instrumentation.api.AgentSpan
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
import datadog.trace.bootstrap.instrumentation.api.Tags
import spock.lang.Specification

class TestDecoratorImplTest extends Specification {

def span = Mock(AgentSpan)
def context = Mock(AgentSpanContext)


def "test afterStart"() {
setup:
def decorator = new TestDecoratorImpl("test-component", "session-name", "test-command", ["ci-tag-1": "value", "ci-tag-2": "another value"])

when:
decorator.afterStart(span)

then:
1 * span.setTag(Tags.TEST_SESSION_NAME, "session-name")
1 * span.setTag(Tags.COMPONENT, "test-component")
1 * span.context().setInstrumentationComponentName("test-component")
1 * span.context() >> context
1 * context.setInstrumentationComponentName("test-component")
1 * span.setTag(Tags.TEST_TYPE, decorator.testType())
1 * span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP)
1 * span.setTag(DDTags.ORIGIN_KEY, decorator.origin())
Expand All @@ -45,6 +48,8 @@ class TestDecoratorImplTest extends Specification {
decorator.afterStart(span)

then:
1 * span.context() >> context
1 * context.setInstrumentationComponentName("test-component")
1 * span.setTag(Tags.TEST_SESSION_NAME, expectedSessionName)

where:
Expand Down
1 change: 1 addition & 0 deletions dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,7 @@ public Span startManual() {
@Override
public Span start() {
final AgentSpan agentSpan = delegate.start();
agentSpan.context().setInstrumentationComponentName("opentracing");
return converter.toSpan(agentSpan);
}

Expand Down
14 changes: 10 additions & 4 deletions dd-trace-ot/src/test/groovy/datadog/opentracing/OpenTracingAPITest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class OpenTracingAPITest extends DDSpecification {
operationName "someOperation"
resourceName "someOperation"
tags {
"$DDTags.INTEGRATION_COMPONENT" "opentracing"
defaultTags()
}
}
Expand All @@ -74,7 +75,7 @@ class OpenTracingAPITest extends DDSpecification {
def "span with builder"() {
when:
Span testSpan = tracer.buildSpan("someOperation")
.withTag(Tags.COMPONENT, "test-component")
.withTag(Tags.COMPONENT, "opentracing")
.withTag("someBoolean", true)
.withTag("someNumber", 1)
.withTag(DDTags.SERVICE_NAME, "someService")
Expand All @@ -100,7 +101,8 @@ class OpenTracingAPITest extends DDSpecification {
operationName "someOperation"
resourceName "someOperation"
tags {
"$datadog.trace.bootstrap.instrumentation.api.Tags.COMPONENT" "test-component"
"$datadog.trace.bootstrap.instrumentation.api.Tags.COMPONENT" "opentracing"
"$DDTags.INTEGRATION_COMPONENT" "opentracing"
"someBoolean" true
"someNumber" 1
defaultTags()
Expand All @@ -122,7 +124,7 @@ class OpenTracingAPITest extends DDSpecification {

when:
testSpan.setTag(DDTags.SERVICE_NAME, "someService")
testSpan.setTag(Tags.COMPONENT, "test-component")
testSpan.setTag(Tags.COMPONENT, "opentracing")
testSpan.setTag("someBoolean", true)
testSpan.setTag("someNumber", 1)
testSpan.setOperationName("someOtherOperation")
Expand All @@ -141,7 +143,8 @@ class OpenTracingAPITest extends DDSpecification {
operationName("someOtherOperation")
resourceName "someOtherOperation"
tags {
"$datadog.trace.bootstrap.instrumentation.api.Tags.COMPONENT" "test-component"
"$datadog.trace.bootstrap.instrumentation.api.Tags.COMPONENT" "opentracing"
"$DDTags.INTEGRATION_COMPONENT" "opentracing"
"someBoolean" true
"someNumber" 1
defaultTags()
Expand Down Expand Up @@ -205,6 +208,7 @@ class OpenTracingAPITest extends DDSpecification {
operationName "someOperation"
resourceName "someOperation"
tags {
"$DDTags.INTEGRATION_COMPONENT" "opentracing"
defaultTags()
}
}
Expand All @@ -214,6 +218,7 @@ class OpenTracingAPITest extends DDSpecification {
resourceName "someOperation2"
childOf(span(0))
tags {
"$DDTags.INTEGRATION_COMPONENT" null
defaultTags()
}
}
Expand Down Expand Up @@ -258,6 +263,7 @@ class OpenTracingAPITest extends DDSpecification {
operationName "someOperation"
resourceName "someOperation"
tags {
"$DDTags.INTEGRATION_COMPONENT" "opentracing"
defaultTags()
}
}
Expand Down
0