Convert couchbase tests to java

instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts

@@ -26,8 +26,9 @@ dependencies {
 
   testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
 
-  latestDepTestLibrary("org.springframework.data:spring-data-couchbase:3.+")
-  latestDepTestLibrary("com.couchbase.client:java-client:2.+")
+  // later versions are tested with couchbase-2.6 instrumentation
+  latestDepTestLibrary("org.springframework.data:spring-data-couchbase:2.+")
+  latestDepTestLibrary("com.couchbase.client:java-client:2.5.+")
 }
 
 tasks.withType<Test>().configureEach {

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java

@@ -32,6 +32,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new CouchbaseBucketInstrumentation(), new CouchbaseClusterInstrumentation());
   }
 
+  @Override
+  public String getModuleGroup() {
+    return "couchbase";
+  }
+
   @Override
   public List<String> injectedClassNames() {
     return singletonList("rx.__OpenTelemetryTracingUtil");

instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAsyncClientTest.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
+
+import com.couchbase.client.java.cluster.BucketSettings;
+import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
+import io.opentelemetry.instrumentation.couchbase.AbstractCouchbaseAsyncClientTest;
+
+class CouchbaseAsyncClientTest extends AbstractCouchbaseAsyncClientTest {
+
+  @Override
+  protected DefaultCouchbaseEnvironment.Builder envBuilder(
+      BucketSettings bucketSettings, int carrierDirectPort, int httpDirectPort) {
+    return CouchbaseUtil.envBuilder(bucketSettings, carrierDirectPort, httpDirectPort);
+  }
+}

instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTest.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
+
+import com.couchbase.client.java.cluster.BucketSettings;
+import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
+import io.opentelemetry.instrumentation.couchbase.AbstractCouchbaseClientTest;
+
+class CouchbaseClientTest extends AbstractCouchbaseClientTest {
+
+  @Override
+  protected DefaultCouchbaseEnvironment.Builder envBuilder(
+      BucketSettings bucketSettings, int carrierDirectPort, int httpDirectPort) {
+    return CouchbaseUtil.envBuilder(bucketSettings, carrierDirectPort, httpDirectPort);
+  }
+}

instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseUtil.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
+
+import com.couchbase.client.core.metrics.DefaultLatencyMetricsCollectorConfig;
+import com.couchbase.client.core.metrics.DefaultMetricsCollectorConfig;
+import com.couchbase.client.java.cluster.BucketSettings;
+import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
+import java.util.concurrent.TimeUnit;
+
+public class CouchbaseUtil {
+
+  public static DefaultCouchbaseEnvironment.Builder envBuilder(
+      BucketSettings bucketSettings, int carrierDirectPort, int httpDirectPort) {
+    // Couchbase seems to be really slow to start sometimes
+    long timeout = TimeUnit.SECONDS.toMillis(20);
+    return DefaultCouchbaseEnvironment.builder()
+        .bootstrapCarrierDirectPort(carrierDirectPort)
+        .bootstrapHttpDirectPort(httpDirectPort)
+        // settings to try to reduce variability in the tests:
+        .runtimeMetricsCollectorConfig(DefaultMetricsCollectorConfig.create(0, TimeUnit.DAYS))
+        .networkLatencyMetricsCollectorConfig(
+            DefaultLatencyMetricsCollectorConfig.create(0, TimeUnit.DAYS))
+        .computationPoolSize(1)
+        .connectTimeout(timeout)
+        .disconnectTimeout(timeout)
+        .kvTimeout(timeout)
+        .managementTimeout(timeout)
+        .queryTimeout(timeout)
+        .viewTimeout(timeout)
+        .keepAliveTimeout(timeout)
+        .searchTimeout(timeout)
+        .analyticsTimeout(timeout)
+        .socketConnectTimeout((int) timeout);
+  }
+
+  private CouchbaseUtil() {}
+}

instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringRepositoryTest.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0.springdata;
+
+import com.couchbase.client.java.cluster.BucketSettings;
+import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
+import io.opentelemetry.instrumentation.couchbase.springdata.AbstractCouchbaseSpringRepositoryTest;
+import io.opentelemetry.instrumentation.couchbase.springdata.TestDocument;
+import io.opentelemetry.instrumentation.couchbase.springdata.TestRepository;
+import io.opentelemetry.javaagent.instrumentation.couchbase.v2_0.CouchbaseUtil;
+
+class CouchbaseSpringRepositoryTest extends AbstractCouchbaseSpringRepositoryTest {
+
+  @Override
+  protected DefaultCouchbaseEnvironment.Builder envBuilder(
+      BucketSettings bucketSettings, int carrierDirectPort, int httpDirectPort) {
+    return CouchbaseUtil.envBuilder(bucketSettings, carrierDirectPort, httpDirectPort);
+  }
+
+  @Override
+  protected TestDocument findById(TestRepository repository, String id) {
+    return repository.findOne(id);
+  }
+
+  @Override
+  protected void deleteById(TestRepository repository, String id) {
+    repository.delete(id);
+  }
+}

instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringTemplateTest.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0.springdata;
+
+import com.couchbase.client.java.cluster.BucketSettings;
+import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
+import io.opentelemetry.instrumentation.couchbase.springdata.AbstractCouchbaseSpringTemplateTest;
+import io.opentelemetry.javaagent.instrumentation.couchbase.v2_0.CouchbaseUtil;
+
+class CouchbaseSpringTemplateTest extends AbstractCouchbaseSpringTemplateTest {
+
+  @Override
+  protected DefaultCouchbaseEnvironment.Builder envBuilder(
+      BucketSettings bucketSettings, int carrierDirectPort, int httpDirectPort) {
+    return CouchbaseUtil.envBuilder(bucketSettings, carrierDirectPort, httpDirectPort);
+  }
+}

instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java

@@ -10,10 +10,13 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class CouchbaseInstrumentationModule extends InstrumentationModule {
+public class CouchbaseInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
+
   public CouchbaseInstrumentationModule() {
     super("couchbase", "couchbase-2.6");
   }
@@ -22,4 +25,9 @@ public CouchbaseInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new CouchbaseCoreInstrumentation(), new CouchbaseNetworkInstrumentation());
   }
+
+  @Override
+  public String getModuleGroup() {
+    return "couchbase";
+  }
 }