Convert all remaining database client decorators to tracers

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java

@@ -18,6 +18,7 @@
 
 import io.grpc.Context;
 import io.opentelemetry.OpenTelemetry;
+import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.InstrumentationVersion;
 import io.opentelemetry.trace.EndSpanOptions;
 import io.opentelemetry.trace.Span;
@@ -61,6 +62,10 @@ public Span startSpan(String spanName, Kind kind) {
     return tracer.spanBuilder(spanName).setSpanKind(kind).startSpan();
   }
 
+  public Scope startScope(Span span) {
+    return tracer.withSpan(span);
+  }
+
   public Span getCurrentSpan() {
     return tracer.getCurrentSpan();
   }

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/DatabaseClientTracer.java

@@ -82,12 +82,6 @@ public Span getClientSpan() {
     return CONTEXT_CLIENT_SPAN_KEY.get(context);
   }
 
-  // TODO make abstract when implemented in all subclasses
-  @Override
-  protected String getInstrumentationName() {
-    return null;
-  }
-
   @Override
   public void end(Span span) {
     span.end();

instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/instrumentation/auto/couchbase/v2_0/CouchbaseBucketInstrumentation.java

@@ -57,7 +57,7 @@ public String[] helperClassNames() {
       "io.opentelemetry.instrumentation.auto.rxjava.SpanFinishingSubscription",
       "io.opentelemetry.instrumentation.auto.rxjava.TracedSubscriber",
       "io.opentelemetry.instrumentation.auto.rxjava.TracedOnSubscribe",
-      packageName + ".CouchbaseClientDecorator",
+      packageName + ".CouchbaseClientTracer",
       packageName + ".CouchbaseOnSubscribe",
     };
   }