sync with main branch

open-telemetry · Nov 15, 2022 · 0ca0549 · 0ca0549
1 parent 25de63f
commit 0ca0549
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 43 deletions.
diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts
@@ -12,8 +12,6 @@ muzzle {
 }
 
 dependencies {
-  implementation(project(":instrumentation:cassandra:cassandra-4.0:library"))
-
   library("com.datastax.oss:java-driver-core:4.0.0")
 
   compileOnly("com.google.auto.value:auto-value-annotations")

diff --git a/...ra/v4_0/CassandraAttributesExtractor.java → ...ra/v4_0/CassandraAttributesExtractor.java b/...ra/v4_0/CassandraAttributesExtractor.java → ...ra/v4_0/CassandraAttributesExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.cassandra.v4_0;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0;
 
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
@@ -16,7 +16,7 @@
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import javax.annotation.Nullable;
 
-public final class CassandraAttributesExtractor
+final class CassandraAttributesExtractor
     implements AttributesExtractor<CassandraRequest, ExecutionInfo> {
 
   @Override

diff --git a/...ra/v4_0/CassandraNetAttributesGetter.java → ...ra/v4_0/CassandraNetAttributesGetter.java b/...ra/v4_0/CassandraNetAttributesGetter.java → ...ra/v4_0/CassandraNetAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.cassandra.v4_0;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0;
 
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import com.datastax.oss.driver.api.core.metadata.Node;
@@ -12,7 +12,7 @@
 import java.net.SocketAddress;
 import javax.annotation.Nullable;
 
-public final class CassandraNetAttributesGetter
+final class CassandraNetAttributesGetter
     extends InetSocketAddressNetClientAttributesGetter<CassandraRequest, ExecutionInfo> {
 
   @Override

diff --git a/...tion/cassandra/v4_0/CassandraRequest.java → ...tion/cassandra/v4_0/CassandraRequest.java b/...tion/cassandra/v4_0/CassandraRequest.java → ...tion/cassandra/v4_0/CassandraRequest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.cassandra.v4_0;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0;
 
 import com.datastax.oss.driver.api.core.session.Session;
 import com.google.auto.value.AutoValue;

diff --git a/...n/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java b/...n/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java
@@ -8,8 +8,6 @@
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.cassandra.v4_0.CassandraRequest;
-import io.opentelemetry.instrumentation.cassandra.v4_0.CassandraTelemetry;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
 
 public final class CassandraSingletons {

diff --git a/...ra/v4_0/CassandraSqlAttributesGetter.java → ...ra/v4_0/CassandraSqlAttributesGetter.java b/...ra/v4_0/CassandraSqlAttributesGetter.java → ...ra/v4_0/CassandraSqlAttributesGetter.java
@@ -3,15 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.cassandra.v4_0;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import io.opentelemetry.instrumentation.api.instrumenter.db.SqlClientAttributesGetter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import javax.annotation.Nullable;
 
-public final class CassandraSqlAttributesGetter
-    implements SqlClientAttributesGetter<CassandraRequest> {
+final class CassandraSqlAttributesGetter implements SqlClientAttributesGetter<CassandraRequest> {
 
   @Override
   public String system(CassandraRequest request) {

diff --git a/...on/cassandra/v4_0/CassandraTelemetry.java → ...on/cassandra/v4_0/CassandraTelemetry.java b/...on/cassandra/v4_0/CassandraTelemetry.java → ...on/cassandra/v4_0/CassandraTelemetry.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.cassandra.v4_0;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0;
 
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import io.opentelemetry.api.OpenTelemetry;

diff --git a/...andra/v4_0/CassandraTelemetryBuilder.java → ...andra/v4_0/CassandraTelemetryBuilder.java b/...andra/v4_0/CassandraTelemetryBuilder.java → ...andra/v4_0/CassandraTelemetryBuilder.java
@@ -3,8 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.cassandra.v4_0;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
 
 public class CassandraTelemetryBuilder {
@@ -20,11 +21,13 @@ public CassandraTelemetryBuilder(OpenTelemetry openTelemetry) {
     this.openTelemetry = openTelemetry;
   }
 
+  @CanIgnoreReturnValue
   public CassandraTelemetryBuilder setInstrumentationName(String instrumentationName) {
     this.instrumentationName = instrumentationName;
     return this;
   }
 
+  @CanIgnoreReturnValue
   public CassandraTelemetryBuilder setStatementSanitizationEnabled(boolean enabled) {
     this.statementSanitizationEnabled = enabled;
     return this;

diff --git a/...va/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CompletionStageFunction.java b/...va/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CompletionStageFunction.java
@@ -8,7 +8,6 @@
 import static io.opentelemetry.javaagent.instrumentation.cassandra.v4_0.CassandraSingletons.instrumenter;
 
 import com.datastax.oss.driver.api.core.CqlSession;
-import io.opentelemetry.instrumentation.cassandra.v4_0.TracingCqlSession;
 import java.util.function.Function;
 
 public class CompletionStageFunction implements Function<Object, Object> {

diff --git a/...ion/cassandra/v4_0/TracingCqlSession.java → ...ion/cassandra/v4_0/TracingCqlSession.java b/...ion/cassandra/v4_0/TracingCqlSession.java → ...ion/cassandra/v4_0/TracingCqlSession.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.cassandra.v4_0;
+package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0;
 
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;

diff --git a/instrumentation/cassandra/cassandra-4.0/library/build.gradle.kts b/instrumentation/cassandra/cassandra-4.0/library/build.gradle.kts
diff --git a/instrumentation/cassandra/cassandra-4.14/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.14/javaagent/build.gradle.kts
@@ -12,7 +12,7 @@ muzzle {
 }
 
 dependencies {
-  implementation(project(":instrumentation:cassandra:cassandra-4.0:library"))
+  implementation(project(":instrumentation:cassandra:cassandra-4.0:javaagent"))
 
   library("com.datastax.oss:java-driver-core:4.14.1")
 

diff --git a/.../java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CassandraSingletons.java b/.../java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CassandraSingletons.java
@@ -8,11 +8,11 @@
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.cassandra.v4_0.CassandraRequest;
-import io.opentelemetry.instrumentation.cassandra.v4_0.CassandraTelemetry;
+import io.opentelemetry.javaagent.instrumentation.cassandra.v4_0.CassandraRequest;
+import io.opentelemetry.javaagent.instrumentation.cassandra.v4_0.CassandraTelemetry;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
 
-public final class CassandraSingletons {
+final class CassandraSingletons {
   // using ExecutionInfo because we can get that from ResultSet, AsyncResultSet and DriverException
   private static final Instrumenter<CassandraRequest, ExecutionInfo> INSTRUMENTER;
 

diff --git a/...a/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CompletionStageFunction.java b/...a/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/CompletionStageFunction.java
@@ -10,7 +10,7 @@
 import com.datastax.oss.driver.api.core.CqlSession;
 import java.util.function.Function;
 
-public class CompletionStageFunction implements Function<Object, Object> {
+class CompletionStageFunction implements Function<Object, Object> {
 
   @Override
   public Object apply(Object session) {

diff --git a/...in/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/TracingCqlSession.java b/...in/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_14/TracingCqlSession.java
@@ -11,10 +11,10 @@
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import com.datastax.oss.driver.api.core.cql.Statement;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.cassandra.v4_0.CassandraRequest;
+import io.opentelemetry.javaagent.instrumentation.cassandra.v4_0.CassandraRequest;
 
 public class TracingCqlSession
-    extends io.opentelemetry.instrumentation.cassandra.v4_0.TracingCqlSession {
+    extends io.opentelemetry.javaagent.instrumentation.cassandra.v4_0.TracingCqlSession {
 
   public TracingCqlSession(
       CqlSession session, Instrumenter<CassandraRequest, ExecutionInfo> instrumenter) {

diff --git a/...rumentation/cassandra/cassandra-4.14/javaagent/src/test/groovy/CassandraClientTest.groovy b/...rumentation/cassandra/cassandra-4.14/javaagent/src/test/groovy/CassandraClientTest.groovy
@@ -96,9 +96,9 @@ class CassandraClientTest extends AgentInstrumentationSpecification {
         childOf((SpanData) parentSpan)
       }
       attributes {
-        "$SemanticAttributes.NET_PEER_NAME" "localhost"
-        "$SemanticAttributes.NET_PEER_IP" "127.0.0.1"
-        "$SemanticAttributes.NET_PEER_PORT" cassandraPort
+        "$SemanticAttributes.NET_SOCK_PEER_ADDR" "127.0.0.1"
+        "$SemanticAttributes.NET_SOCK_PEER_NAME" "localhost"
+        "$SemanticAttributes.NET_SOCK_PEER_PORT" cassandraPort
         "$SemanticAttributes.DB_SYSTEM" "cassandra"
         "$SemanticAttributes.DB_NAME" keyspace
         "$SemanticAttributes.DB_STATEMENT" statement

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -173,7 +173,6 @@ include(":instrumentation:azure-core:azure-core-1.19:javaagent")
 include(":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded")
 include(":instrumentation:cassandra:cassandra-3.0:javaagent")
 include(":instrumentation:cassandra:cassandra-4.0:javaagent")
-include(":instrumentation:cassandra:cassandra-4.0:library")
 include(":instrumentation:cassandra:cassandra-4.14:javaagent")
 include(":instrumentation:cdi-testing")
 include(":instrumentation:graphql-java-12.0:javaagent")