Fix after rebase

Author: Mateusz Rzeszutek

custom/src/main/java/com/splunk/opentelemetry/JdbcSpanRenamingProcessor.java

@@ -16,11 +16,11 @@
 
 package com.splunk.opentelemetry;
 
-import io.opentelemetry.common.AttributeValue;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.ReadWriteSpan;
 import io.opentelemetry.sdk.trace.ReadableSpan;
 import io.opentelemetry.sdk.trace.SpanProcessor;
+import io.opentelemetry.trace.attributes.SemanticAttributes;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -44,17 +44,15 @@ public class JdbcSpanRenamingProcessor implements SpanProcessor {
 
   @Override
   public void onStart(ReadWriteSpan span) {
-    AttributeValue dbSystem = span.toSpanData().getAttributes().get("db.system");
+    String dbSystem = span.toSpanData().getAttributes().get(SemanticAttributes.DB_SYSTEM);
     if (isJdbcSpan(dbSystem)) {
       String query = span.getName().trim().toUpperCase();
       span.updateName(getStatementType(query));
     }
   }
 
-  private boolean isJdbcSpan(AttributeValue dbSystem) {
-    return dbSystem != null
-        && dbSystem.getType() == AttributeValue.Type.STRING
-        && SQL_SYSTEMS.contains(dbSystem.getStringValue());
+  private boolean isJdbcSpan(String dbSystem) {
+    return SQL_SYSTEMS.contains(dbSystem);
   }
 
   private String getStatementType(String query) {

custom/src/test/java/com/splunk/opentelemetry/JdbcSpanRenamingProcessorTest.java

@@ -16,8 +16,7 @@
 
 package com.splunk.opentelemetry;
 
-import static io.opentelemetry.common.AttributeValue.longAttributeValue;
-import static io.opentelemetry.common.AttributeValue.stringAttributeValue;
+import static io.opentelemetry.trace.attributes.SemanticAttributes.DB_SYSTEM;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
@@ -53,19 +52,7 @@ void shouldRequireOnStart() {
   @Test
   void shouldIgnoreSpansThatDoNotHaveDbSystemAttribute() {
     // given
-    given(span.toSpanData().getAttributes().get("db.system")).willReturn(null);
-
-    // when
-    processor.onStart(span);
-
-    // then
-    then(span).should(never()).updateName(anyString());
-  }
-
-  @Test
-  void shouldIgnoreSpansThatHaveWrongTypeAttribute() {
-    // given
-    given(span.toSpanData().getAttributes().get("db.system")).willReturn(longAttributeValue(42));
+    given(span.toSpanData().getAttributes().get(DB_SYSTEM)).willReturn(null);
 
     // when
     processor.onStart(span);
@@ -77,8 +64,7 @@ void shouldIgnoreSpansThatHaveWrongTypeAttribute() {
   @Test
   void shouldIgnoreSpansThatAreNotSql() {
     // given
-    given(span.toSpanData().getAttributes().get("db.system"))
-        .willReturn(stringAttributeValue("mongodb"));
+    given(span.toSpanData().getAttributes().get(DB_SYSTEM)).willReturn("mongodb");
 
     // when
     processor.onStart(span);
@@ -103,8 +89,7 @@ void shouldIgnoreSpansThatAreNotSql() {
       })
   void shouldUpdateJdbcSpans(String dbSystem) {
     // given
-    given(span.toSpanData().getAttributes().get("db.system"))
-        .willReturn(stringAttributeValue(dbSystem));
+    given(span.toSpanData().getAttributes().get(DB_SYSTEM)).willReturn(dbSystem);
     given(span.getName()).willReturn("select * from table");
 
     // when
@@ -118,8 +103,7 @@ void shouldUpdateJdbcSpans(String dbSystem) {
   @MethodSource("spanNameArgs")
   void shouldGetSqlStatementTypeFromSpanName(String query, String sqlStatementType) {
     // given
-    given(span.toSpanData().getAttributes().get("db.system"))
-        .willReturn(stringAttributeValue("other_sql"));
+    given(span.toSpanData().getAttributes().get(DB_SYSTEM)).willReturn("other_sql");
     given(span.getName()).willReturn(query);
 
     // when