diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBComponent.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/DBComponent.java
index 0f3f66bd25..04040d9cd4 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBComponent.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/integration/DBComponent.java
@@ -2,7 +2,6 @@ package com.datadoghq.trace.integration;
 
 import com.datadoghq.trace.DDSpanContext;
 import com.datadoghq.trace.DDTags;
-
 import io.opentracing.tag.Tags;
 
 /**
@@ -10,7 +9,7 @@ import io.opentracing.tag.Tags;
  * service name  and retrieves some DB meta such as the statement
  */
 public class DBComponent extends DDSpanContextDecorator {
-	
+
 	public DBComponent() {
 		super();
 		this.setMatchingTag(Tags.COMPONENT.getKey());
@@ -20,14 +19,12 @@ public class DBComponent extends DDSpanContextDecorator {
 	@Override
 	public boolean afterSetTag(DDSpanContext context, String tag, Object value) {
 		//Assign service name
-		if(super.afterSetTag(context, tag, value)){
+		if (super.afterSetTag(context, tag, value)) {
 			//Assign span type to DB
 			context.setSpanType("db");
-			
+
 			//Assign resource name
-			if(tag.equals(Tags.DB_STATEMENT.getKey())){
-				context.setResourceName(String.valueOf(value));
-			}
+			context.setResourceName(String.valueOf(value));
 			return true;
 		}
 		return false;
diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/DDSpanContextDecorator.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/DDSpanContextDecorator.java
index d8b7481e88..e46f5269e9 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/integration/DDSpanContextDecorator.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/integration/DDSpanContextDecorator.java
@@ -15,13 +15,13 @@ public abstract class DDSpanContextDecorator {
 
 	private String setValue;
 
-	public boolean afterSetTag(DDSpanContext context, String tag, Object value){
-		if(tag.equals(this.getMatchingTag()) && (this.getMatchingValue()==null || value.equals(this.getMatchingValue()))){
-			String targetTag = getSetTag()==null?tag:getSetTag();
-			String targetValue = getSetValue()==null?String.valueOf(value):getSetTag();
+	public boolean afterSetTag(DDSpanContext context, String tag, Object value) {
+		if ((this.getMatchingValue() == null || value.equals(this.getMatchingValue()))) {
+			String targetTag = getSetTag() == null ? tag : getSetTag();
+			String targetValue = getSetValue() == null ? String.valueOf(value) : getSetTag();
 			context.setTag(targetTag, targetValue);
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPComponent.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPComponent.java
index 6fa507054e..8371153747 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPComponent.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPComponent.java
@@ -2,7 +2,6 @@ package com.datadoghq.trace.integration;
 
 import com.datadoghq.trace.DDSpanContext;
 import com.datadoghq.trace.DDTags;
-
 import io.opentracing.tag.Tags;
 
 
@@ -11,7 +10,7 @@ import io.opentracing.tag.Tags;
  * service name  and retrieves some HTTP meta such as the request path
  */
 public class HTTPComponent extends DDSpanContextDecorator {
-	
+
 	public HTTPComponent() {
 		super();
 		this.setMatchingTag(Tags.COMPONENT.getKey());
@@ -21,11 +20,12 @@ public class HTTPComponent extends DDSpanContextDecorator {
 	@Override
 	public boolean afterSetTag(DDSpanContext context, String tag, Object value) {
 		//Assign service name
-		if(super.afterSetTag(context, tag, value)){
+		if (super.afterSetTag(context, tag, value)) {
+
 			//Assign span type to WEB
 			context.setSpanType("web");
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java
index 5efba3f686..d244abc1dc 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java
@@ -1,14 +1,13 @@
 package com.datadoghq.trace.integration;
 
-import java.net.MalformedURLException;
-
 import com.datadoghq.trace.DDSpanContext;
 import com.datadoghq.trace.DDTags;
-
 import io.opentracing.tag.Tags;
 
+import java.net.MalformedURLException;
+
 public class URLAsResourceName extends DDSpanContextDecorator {
-	
+
 	public URLAsResourceName() {
 		super();
 		this.setMatchingTag(Tags.HTTP_URL.getKey());
@@ -18,17 +17,13 @@ public class URLAsResourceName extends DDSpanContextDecorator {
 	@Override
 	public boolean afterSetTag(DDSpanContext context, String tag, Object value) {
 		//Assign resource name
-		if(tag.equals(Tags.HTTP_URL.getKey())){
-			try {
-				String path = new java.net.URL(String.valueOf(value)).getPath();
-				context.setTag(this.getSetTag(),path);
-			} catch (MalformedURLException e) {
-				context.setResourceName(String.valueOf(value));
-			}
-			return true;
-		}else{
-			return false;
+		try {
+			String path = new java.net.URL(String.valueOf(value)).getPath();
+			context.setTag(this.getSetTag(), path);
+		} catch (MalformedURLException e) {
+			context.setResourceName(String.valueOf(value));
 		}
+		return true;
 	}
 
 }