Some EventStoreDB renaming in otel and readme

Author: w1am

README.md

@@ -31,13 +31,13 @@ repositories {
 
 ## Developing
 
-The SDK is built using [`Gradle`][gradle]. Integration tests run against a server using Docker, with the [Kurrent gRPC Client Test Container][container].
+The SDK is built using [`Gradle`][gradle]. Integration tests run against a server using Docker.
 
 ### Run tests
 
 Tests are written using [TestContainers](https://www.testcontainers.org/) and require [Docker](https://www.docker.com/) to be installed.
 
-Specific docker images can be specified via the enviroment variable `EVENTSTORE_IMAGE`.
+Specific docker images can be specified via the environment variable `EVENTSTORE_IMAGE`.
 
 ## Open Telemetry
 
@@ -164,7 +164,7 @@ CountResult result = client
     .get();
 ```
 
-For further details please see [the projection management tests](src/test/java/com/eventstore/dbclient/ProjectionManagementTests.java).
+For further details please see [the projection management tests](src/test/java/io/kurrent/dbclient/ProjectionManagementTests.java).
 
 ## Support
 
@@ -193,7 +193,6 @@ review our [Contributing Guide][contributing] and [Code of Conduct][code-of-cond
 
 [kurrent]: https://kurrent.io
 [gradle]: https://gradle.org
-[container]: https://github.com/Kurrent/Kurrent-Client-gRPC-TestData
 [contributing]: https://github.com/Kurrent/Kurrent-Client-Java/tree/master/CONTRIBUTING.md
 [code-of-conduct]: https://github.com/Kurrent/Kurrent-Client-Java/tree/master/CODE-OF-CONDUCT.md
 [support]: https://kurrent.io/support/

db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetry.java

@@ -94,7 +94,7 @@ static CompletableFuture<WriteResult> traceAppend(
                 SpanKind.CLIENT,
                 null,
                 ClientTelemetryTags.builder()
-                        .withRequiredTag(ClientTelemetryAttributes.EventStore.STREAM, streamId)
+                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.STREAM, streamId)
                         .withServerTagsFromGrpcChannel(channel)
                         .withServerTagsFromClientSettings(settings)
                         .withOptionalDatabaseUserTag(settings.getDefaultCredentials())
@@ -139,10 +139,10 @@ static void traceSubscribe(Runnable tracedOperation, String subscriptionId, Mana
                 SpanKind.CONSUMER,
                 remoteParentContext,
                 ClientTelemetryTags.builder()
-                        .withRequiredTag(ClientTelemetryAttributes.EventStore.STREAM, event.getStreamId())
-                        .withRequiredTag(ClientTelemetryAttributes.EventStore.SUBSCRIPTION_ID, subscriptionId)
-                        .withRequiredTag(ClientTelemetryAttributes.EventStore.EVENT_ID, event.getEventId().toString())
-                        .withRequiredTag(ClientTelemetryAttributes.EventStore.EVENT_TYPE, event.getEventType())
+                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.STREAM, event.getStreamId())
+                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.SUBSCRIPTION_ID, subscriptionId)
+                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.EVENT_ID, event.getEventId().toString())
+                        .withRequiredTag(ClientTelemetryAttributes.Kurrent.EVENT_TYPE, event.getEventType())
                         .withServerTagsFromGrpcChannel(channel)
                         .withServerTagsFromClientSettings(settings)
                         .withOptionalDatabaseUserTag(settings.getDefaultCredentials())

db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java

@@ -1,7 +1,6 @@
 package io.kurrent.dbclient;
 
 import io.opentelemetry.semconv.ExceptionAttributes;
-import io.opentelemetry.semconv.OtelAttributes;
 import io.opentelemetry.semconv.ServerAttributes;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 
@@ -23,7 +22,7 @@ public static class Exceptions {
         public static final String STACK_TRACE = ExceptionAttributes.EXCEPTION_STACKTRACE.getKey();
     }
 
-    public static class EventStore {
+    public static class Kurrent {
         public static final String STREAM = "db.kurrent.stream";
         public static final String SUBSCRIPTION_ID = "db.kurrent.subscription.id";
         public static final String EVENT_ID = "db.kurrent.event.id";

db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java

@@ -1,7 +1,7 @@
 package io.kurrent.dbclient;
 
 public class ClientTelemetryConstants {
-    public static final String INSTRUMENTATION_NAME = "eventstoredb";
+    public static final String INSTRUMENTATION_NAME = "kurrent";
 
     public static class Metadata {
         public static final String TRACE_ID = "$traceId";

db-client-java/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java

@@ -1,7 +1,7 @@
 package io.kurrent.dbclient;
 
 /**
- * A request not supported by the targeted EventStoreDB node was sent.
+ * A request not supported by the targeted KurrentDB node was sent.
  */
 public class UnsupportedFeatureException extends RuntimeException {
     UnsupportedFeatureException(){

db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java

@@ -21,7 +21,7 @@ public interface TelemetryAware extends ConnectionAware {
     default void assertAppendSpanHasExpectedAttributes(ReadableSpan span, String streamName) {
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.SYSTEM, ClientTelemetryConstants.INSTRUMENTATION_NAME);
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.OPERATION, ClientTelemetryConstants.Operations.APPEND);
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.STREAM, streamName);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.STREAM, streamName);
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.USER, "admin");
         Assertions.assertEquals(StatusCode.OK, span.toSpanData().getStatus().getStatusCode());
         Assertions.assertEquals(SpanKind.CLIENT, span.getKind());
@@ -42,10 +42,10 @@ default void assertSubscriptionActivityHasExpectedAttributes(ReadableSpan span,
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.SYSTEM, ClientTelemetryConstants.INSTRUMENTATION_NAME);
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.OPERATION, ClientTelemetryConstants.Operations.SUBSCRIBE);
         assertSpanAttributeEquals(span, ClientTelemetryAttributes.Database.USER, "admin");
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.STREAM, streamName);
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.SUBSCRIPTION_ID, subscriptionId);
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.EVENT_ID, eventId);
-        assertSpanAttributeEquals(span, ClientTelemetryAttributes.EventStore.EVENT_TYPE, eventType);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.STREAM, streamName);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.SUBSCRIPTION_ID, subscriptionId);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.EVENT_ID, eventId);
+        assertSpanAttributeEquals(span, ClientTelemetryAttributes.Kurrent.EVENT_TYPE, eventType);
         Assertions.assertEquals(StatusCode.OK, span.toSpanData().getStatus().getStatusCode());
         Assertions.assertEquals(SpanKind.CONSUMER, span.getKind());
     }