Skip to content

Fix Couchbase stable DB span names #18993

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
trask merged 1 commit into from
Jun 15, 2026
Merged

Fix Couchbase stable DB span names #18993

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
4 changes: 3 additions & 1 deletion ...io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseSpanNameExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;

import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;

import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.javaagent.instrumentation.couchbase.common.v2_0.CouchbaseRequestInfo;

Expand All @@ -17,7 +19,7 @@ class CouchbaseSpanNameExtractor implements SpanNameExtractor<CouchbaseRequestIn

@Override
public String extract(CouchbaseRequestInfo couchbaseRequest) {
if (couchbaseRequest.isMethodCall()) {
if (!emitStableDatabaseSemconv() && couchbaseRequest.isMethodCall()) {
return couchbaseRequest.getOperation();
}
return dbSpanNameExtractor.extract(couchbaseRequest);
Expand Down
15 changes: 12 additions & 3 deletions ...ain/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,10 @@ void upsert(BucketSettings bucketSettings) {
equalTo(maybeStable(DB_SYSTEM), COUCHBASE),
equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")),
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + bucketSettings.name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(1))
.hasAttributesSatisfyingExactly(
Expand Down Expand Up @@ -230,7 +233,10 @@ void upsertAndGet(BucketSettings bucketSettings) {
equalTo(maybeStable(DB_SYSTEM), COUCHBASE),
equalTo(maybeStable(DB_OPERATION), "Cluster.openBucket")),
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + bucketSettings.name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(1))
.hasAttributesSatisfyingExactly(
Expand All @@ -245,7 +251,10 @@ void upsertAndGet(BucketSettings bucketSettings) {
satisfies(
stringKey("couchbase.operation_id"), experimentalAttribute())),
span ->
span.hasName("Bucket.get")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.get " + bucketSettings.name()
: "Bucket.get")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(2))
.hasAttributesSatisfyingExactly(
Expand Down
10 changes: 8 additions & 2 deletions ...src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,10 @@ void upsertAndGet(BucketSettings bucketSettings) {
trace.hasSpansSatisfyingExactly(
span -> span.hasName("someTrace").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + bucketSettings.name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand All @@ -167,7 +170,10 @@ void upsertAndGet(BucketSettings bucketSettings) {
satisfies(
stringKey("couchbase.operation_id"), experimentalAttribute())),
span ->
span.hasName("Bucket.get")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.get " + bucketSettings.name()
: "Bucket.get")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand Down
36 changes: 29 additions & 7 deletions ...telemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package io.opentelemetry.instrumentation.couchbase.springdata;

import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
Expand Down Expand Up @@ -125,7 +126,10 @@ void save() {
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + bucketCouchbase.name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasNoParent()
.hasAttributesSatisfyingExactly(
Expand Down Expand Up @@ -160,7 +164,10 @@ void saveAndRetrieve() {
trace.hasSpansSatisfyingExactly(
span -> span.hasName("someTrace").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + bucketCouchbase.name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand All @@ -175,7 +182,10 @@ void saveAndRetrieve() {
satisfies(
stringKey("couchbase.operation_id"), experimentalAttribute())),
span ->
span.hasName("Bucket.get")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.get " + bucketCouchbase.name()
: "Bucket.get")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand Down Expand Up @@ -208,7 +218,10 @@ void saveAndUpdate() {
trace.hasSpansSatisfyingExactly(
span -> span.hasName("someTrace").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + bucketCouchbase.name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand All @@ -223,7 +236,10 @@ void saveAndUpdate() {
satisfies(
stringKey("couchbase.operation_id"), experimentalAttribute())),
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + bucketCouchbase.name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand Down Expand Up @@ -258,7 +274,10 @@ void saveAndDelete() {
trace.hasSpansSatisfyingExactly(
span -> span.hasName("someTrace").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + bucketCouchbase.name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand All @@ -273,7 +292,10 @@ void saveAndDelete() {
satisfies(
stringKey("couchbase.operation_id"), experimentalAttribute())),
span ->
span.hasName("Bucket.remove")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.remove " + bucketCouchbase.name()
: "Bucket.remove")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand Down
26 changes: 21 additions & 5 deletions ...entelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package io.opentelemetry.instrumentation.couchbase.springdata;

import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
Expand Down Expand Up @@ -106,7 +107,10 @@ void write(CouchbaseTemplate template) {
trace.hasSpansSatisfyingExactly(
span -> span.hasName("someTrace").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + template.getCouchbaseBucket().name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand All @@ -121,7 +125,10 @@ void write(CouchbaseTemplate template) {
satisfies(
stringKey("couchbase.operation_id"), experimentalAttribute())),
span ->
span.hasName("Bucket.get")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.get " + template.getCouchbaseBucket().name()
: "Bucket.get")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand Down Expand Up @@ -153,7 +160,10 @@ void remove(CouchbaseTemplate template) {
trace.hasSpansSatisfyingExactly(
span -> span.hasName("someTrace").hasKind(SpanKind.INTERNAL).hasNoParent(),
span ->
span.hasName("Bucket.upsert")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.upsert " + template.getCouchbaseBucket().name()
: "Bucket.upsert")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand All @@ -168,7 +178,10 @@ void remove(CouchbaseTemplate template) {
satisfies(
stringKey("couchbase.operation_id"), experimentalAttribute())),
span ->
span.hasName("Bucket.remove")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.remove " + template.getCouchbaseBucket().name()
: "Bucket.remove")
.hasKind(SpanKind.CLIENT)
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
Expand All @@ -192,7 +205,10 @@ void remove(CouchbaseTemplate template) {
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("Bucket.get")
span.hasName(
emitStableDatabaseSemconv()
? "Bucket.get " + template.getCouchbaseBucket().name()
: "Bucket.get")
.hasKind(SpanKind.CLIENT)
.hasNoParent()
.hasAttributesSatisfyingExactly(
Expand Down
Loading