Skip to content

Commit

Permalink
Update WithSpan tests (#12968)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaydeluca
jaydeluca authored Dec 24, 2024
1 parent 54abdea commit 02725c1
Show file tree
Hide file tree
Showing 2 changed files with 252 additions and 488 deletions.
162 changes: 57 additions & 105 deletions ...c/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

package io.opentelemetry.test.annotation;

import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION;
import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE;

import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanId;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -24,89 +24,60 @@ class AddingSpanAttributesInstrumentationTest {
AgentInstrumentationExtension.create();

@Test
void captureAttributesInNewSpan() throws Exception {

void captureAttributesInNewSpan() {
testing.runWithSpan(
"root",
() ->
new ExtractAttributesUsingAddingSpanAttributes()
.withSpanTakesPrecedence("foo", "bar", null, "baz"));

assertThat(testing.waitForTraces(1))
.satisfiesExactly(
trace ->
assertThat(trace)
.satisfiesExactly(
span ->
assertThat(span)
.hasName("root")
.hasKind(SpanKind.INTERNAL)
.hasParentSpanId(SpanId.getInvalid()),
span ->
assertThat(span)
.hasName(
"ExtractAttributesUsingAddingSpanAttributes.withSpanTakesPrecedence")
.hasKind(SpanKind.INTERNAL)
.hasParentSpanId(trace.get(0).getSpanId())
.hasAttributesSatisfying(
attributes ->
assertThat(attributes)
.containsOnly(
entry(
CodeIncubatingAttributes.CODE_NAMESPACE,
ExtractAttributesUsingAddingSpanAttributes.class
.getName()),
entry(
CodeIncubatingAttributes.CODE_FUNCTION,
"withSpanTakesPrecedence"),
entry(
AttributeKey.stringKey("implicitName"), "foo"),
entry(
AttributeKey.stringKey("explicitName"),
"bar")))));
testing.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("root").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName(
"ExtractAttributesUsingAddingSpanAttributes.withSpanTakesPrecedence")
.hasKind(SpanKind.INTERNAL)
.hasParentSpanId(trace.getSpan(0).getSpanId())
.hasAttributesSatisfyingExactly(
equalTo(
CODE_NAMESPACE,
ExtractAttributesUsingAddingSpanAttributes.class.getName()),
equalTo(CODE_FUNCTION, "withSpanTakesPrecedence"),
equalTo(stringKey("implicitName"), "foo"),
equalTo(stringKey("explicitName"), "bar"))));
}

@Test
void captureAttributesInCurrentSpan() throws Exception {

void captureAttributesInCurrentSpan() {
testing.runWithSpan(
"root",
() ->
new ExtractAttributesUsingAddingSpanAttributes()
.withSpanAttributes("foo", "bar", null, "baz"));

assertThat(testing.waitForTraces(1))
.satisfiesExactly(
trace ->
assertThat(trace)
.satisfiesExactly(
span ->
assertThat(span)
.hasName("root")
.hasKind(SpanKind.INTERNAL)
.hasParentSpanId(SpanId.getInvalid())
.hasAttributesSatisfying(
attributes ->
assertThat(attributes)
.containsOnly(
entry(
AttributeKey.stringKey("implicitName"), "foo"),
entry(
AttributeKey.stringKey("explicitName"),
"bar")))));
testing.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("root")
.hasKind(SpanKind.INTERNAL)
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("implicitName"), "foo"),
equalTo(stringKey("explicitName"), "bar"))));
}

@Test
void noExistingSpan() throws Exception {

void noExistingSpan() {
new ExtractAttributesUsingAddingSpanAttributes().withSpanAttributes("foo", "bar", null, "baz");

assertThat(testing.waitForTraces(0)).isEmpty();
}

@Test
void overwriteAttributes() throws Exception {

void overwriteAttributes() {
testing.runWithSpan(
"root",
() -> {
Expand All @@ -116,31 +87,21 @@ void overwriteAttributes() throws Exception {
.withSpanAttributes("foo", "bar", null, "baz");
});

assertThat(testing.waitForTraces(1))
.satisfiesExactly(
trace ->
assertThat(trace)
.satisfiesExactly(
span ->
assertThat(span)
.hasName("root")
.hasKind(SpanKind.INTERNAL)
.hasParentSpanId(SpanId.getInvalid())
.hasAttributesSatisfying(
attributes ->
assertThat(attributes)
.containsOnly(
entry(AttributeKey.stringKey("keep"), "willbekept"),
entry(
AttributeKey.stringKey("implicitName"), "foo"),
entry(
AttributeKey.stringKey("explicitName"),
"bar")))));
testing.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("root")
.hasKind(SpanKind.INTERNAL)
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("keep"), "willbekept"),
equalTo(stringKey("implicitName"), "foo"),
equalTo(stringKey("explicitName"), "bar"))));
}

@Test
void multiMethodOverwriteAttributes() throws Exception {

void multiMethodOverwriteAttributes() {
testing.runWithSpan(
"root",
() -> {
Expand All @@ -150,25 +111,16 @@ void multiMethodOverwriteAttributes() throws Exception {
.withSpanAttributesParent("parentbegone", "parentbegone", null, "parentbegone");
});

assertThat(testing.waitForTraces(1))
.satisfiesExactly(
trace ->
assertThat(trace)
.satisfiesExactly(
span ->
assertThat(span)
.hasName("root")
.hasKind(SpanKind.INTERNAL)
.hasParentSpanId(SpanId.getInvalid())
.hasAttributesSatisfying(
attributes ->
assertThat(attributes)
.containsOnly(
entry(AttributeKey.stringKey("keep"), "willbekept"),
entry(
AttributeKey.stringKey("implicitName"), "foo"),
entry(
AttributeKey.stringKey("explicitName"),
"bar")))));
testing.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("root")
.hasKind(SpanKind.INTERNAL)
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("keep"), "willbekept"),
equalTo(stringKey("implicitName"), "foo"),
equalTo(stringKey("explicitName"), "bar"))));
}
}
Loading

0 comments on commit 02725c1

Please sign in to comment.