Skip to content

Commit 96a07c6

Browse files
traskCopilot
andcommitted
Fix Couchbase 2.6 span assertions and plugin resolution
Couchbase 2.6 spans no longer emit the deprecated network.* span attributes, so the 2.6 test subclasses should use the shared default that expects them to be absent. The smoke-test build also needed Maven Central in pluginManagement so Spring Boot plugin classpath dependencies are resolved outside the Gradle Plugin Portal. Validated with: .\gradlew.bat :instrumentation:couchbase:couchbase-2.6:javaagent:test -PtestJavaVersion=8 -PtestJavaVM=hotspot -PtestIndy=true --no-daemon .\gradlew.bat :smoke-tests:test -PsmokeTestSuite=none --no-daemon Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 86186b2 commit 96a07c6

5 files changed

Lines changed: 5 additions & 20 deletions

File tree

instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseAsyncClient26Test.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,4 @@ protected DefaultCouchbaseEnvironment.Builder envBuilder(
1616
BucketSettings bucketSettings, int carrierDirectPort, int httpDirectPort) {
1717
return Couchbase26Util.envBuilder(bucketSettings, carrierDirectPort, httpDirectPort);
1818
}
19-
20-
@Override
21-
protected boolean includesNetworkAttributes() {
22-
return true;
23-
}
2419
}

instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseClient26Test.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ protected DefaultCouchbaseEnvironment.Builder envBuilder(
2727
return Couchbase26Util.envBuilder(bucketSettings, carrierDirectPort, httpDirectPort);
2828
}
2929

30-
@Override
31-
protected boolean includesNetworkAttributes() {
32-
return true;
33-
}
34-
3530
@Test
3631
void hasDurationMetric() {
3732
CouchbaseCluster cluster = prepareCluster(bucketCouchbase);

instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringRepository26Test.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ protected DefaultCouchbaseEnvironment.Builder envBuilder(
2020
return Couchbase26Util.envBuilder(bucketSettings, carrierDirectPort, httpDirectPort);
2121
}
2222

23-
@Override
24-
protected boolean includesNetworkAttributes() {
25-
return true;
26-
}
27-
2823
@Override
2924
protected TestDocument findById(TestRepository repository, String id) {
3025
return repository.findById(id).get();

instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringTemplate26Test.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,4 @@ protected DefaultCouchbaseEnvironment.Builder envBuilder(
1717
BucketSettings bucketSettings, int carrierDirectPort, int httpDirectPort) {
1818
return Couchbase26Util.envBuilder(bucketSettings, carrierDirectPort, httpDirectPort);
1919
}
20-
21-
@Override
22-
protected boolean includesNetworkAttributes() {
23-
return true;
24-
}
2520
}

settings.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
mavenCentral()
5+
}
6+
27
plugins {
38
id("com.github.jk1.dependency-license-report") version "3.1.2"
49
id("com.google.cloud.tools.jib") version "3.5.3"

0 commit comments

Comments
 (0)