Updating the test cases and adding unit test for isDbSpan

Author: ektabj

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsSpanProcessingUtil.java

@@ -18,7 +18,6 @@
 import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION;
 import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT;
 import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM;
-import static io.opentelemetry.semconv.SemanticAttributes.DB_USER;
 import static io.opentelemetry.semconv.SemanticAttributes.HTTP_METHOD;
 import static io.opentelemetry.semconv.SemanticAttributes.HTTP_TARGET;
 import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_OPERATION;
@@ -227,7 +226,6 @@ private static String generateIngressOperation(SpanData span) {
   static boolean isDBSpan(SpanData span) {
     return isKeyPresent(span, DB_SYSTEM)
         || isKeyPresent(span, DB_OPERATION)
-        || isKeyPresent(span, DB_USER)
         || isKeyPresent(span, DB_STATEMENT);
   }
 }

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java

@@ -1032,13 +1032,16 @@ private void validateHttpStatusForNonLocalRootWithThrowableForClient(
 
   @Test
   void testDBUserAttribute() {
-    String dbUser = "test_user";
-    mockAttribute(DB_USER, dbUser);
+    mockAttribute(DB_SYSTEM, "db_system");
+    mockAttribute(DB_OPERATION, "db_operation");
+    mockAttribute(DB_STATEMENT, "db_statement");
+    mockAttribute(DB_USER, "db_user");
     when(spanDataMock.getKind()).thenReturn(SpanKind.CLIENT);
 
     Attributes actualAttributes =
         GENERATOR.generateMetricAttributeMapFromSpan(spanDataMock, resource).get(DEPENDENCY_METRIC);
-    assertThat(actualAttributes.get(AWS_REMOTE_DB_USER)).isEqualTo(dbUser);
+    assertThat(actualAttributes.get(AWS_REMOTE_OPERATION)).isEqualTo("db_operation");
+    assertThat(actualAttributes.get(AWS_REMOTE_DB_USER)).isEqualTo("db_user");
   }
 
   @Test
@@ -1053,18 +1056,20 @@ void testDBUserAttributeAbsent() {
 
   @Test
   void testDBUserAttributeWithDifferentValues() {
-    String dbUser = "non_db_user";
-    mockAttribute(DB_USER, dbUser);
+    mockAttribute(DB_SYSTEM, "db_system");
+    mockAttribute(DB_OPERATION, "db_operation");
+    mockAttribute(DB_STATEMENT, "db_statement");
+    mockAttribute(DB_USER, "non_db_user");
     when(spanDataMock.getKind()).thenReturn(SpanKind.CLIENT);
 
     Attributes actualAttributes =
         GENERATOR.generateMetricAttributeMapFromSpan(spanDataMock, resource).get(DEPENDENCY_METRIC);
-    assertThat(actualAttributes.get(AWS_REMOTE_DB_USER)).isEqualTo(dbUser);
+    assertThat(actualAttributes.get(AWS_REMOTE_DB_USER)).isEqualTo("non_db_user");
   }
 
   @Test
   void testDBUserAttributeNotPresentInServiceMetricForServerSpan() {
-    String dbUser = "test_user";
+    String dbUser = "db_user";
     mockAttribute(DB_USER, dbUser);
     when(spanDataMock.getKind()).thenReturn(SpanKind.SERVER);
 
@@ -1073,6 +1078,24 @@ void testDBUserAttributeNotPresentInServiceMetricForServerSpan() {
     assertThat(actualAttributes.get(AWS_REMOTE_DB_USER)).isNull();
   }
 
+  @Test
+  public void testIsDbSpanTrue() {
+    mockAttribute(DB_SYSTEM, "DB system");
+    mockAttribute(DB_OPERATION, "DB operation");
+    mockAttribute(DB_USER, "DB user");
+    when(spanDataMock.getKind()).thenReturn(SpanKind.CLIENT);
+
+    assertThat(AwsSpanProcessingUtil.isDBSpan(spanDataMock)).isTrue();
+  }
+
+  @Test
+  public void testIsDbSpanFalse() {
+    mockAttribute(DB_SYSTEM, null);
+    when(spanDataMock.getKind()).thenReturn(SpanKind.CLIENT);
+
+    assertThat(AwsSpanProcessingUtil.isDBSpan(spanDataMock)).isFalse();
+  }
+
   @Test
   public void testNormalizeRemoteServiceName_NoNormalization() {
     String serviceName = "non aws service";