Merge branch 'master' into smola/unique-onrootspanfinished

Author: smola

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/DBInfo.java

@@ -13,6 +13,8 @@ public class DBInfo {
   private final String db;
   private final String host;
   private final Integer port;
+  private final String warehouse;
+  private final String schema;
 
   DBInfo(
       String type,
@@ -23,7 +25,9 @@ public class DBInfo {
       String instance,
       String db,
       String host,
-      Integer port) {
+      Integer port,
+      String warehouse,
+      String schema) {
     this.type = type;
     this.subtype = subtype;
     this.fullPropagationSupport = fullPropagationSupport;
@@ -33,6 +37,8 @@ public class DBInfo {
     this.db = db;
     this.host = host;
     this.port = port;
+    this.warehouse = warehouse;
+    this.schema = schema;
   }
 
   public static class Builder {
@@ -45,6 +51,8 @@ public static class Builder {
     private String user;
     private String instance;
     private String db;
+    private String warehouse;
+    private String schema;
     private String host;
     private Integer port;
 
@@ -59,7 +67,9 @@ public static class Builder {
         String instance,
         String db,
         String host,
-        Integer port) {
+        Integer port,
+        String warehouse,
+        String schema) {
       this.type = type;
       this.subtype = subtype;
       this.fullPropagationSupport = fullPropagationSupport;
@@ -69,6 +79,8 @@ public static class Builder {
       this.db = db;
       this.host = host;
       this.port = port;
+      this.warehouse = warehouse;
+      this.schema = schema;
     }
 
     public Builder type(String type) {
@@ -109,6 +121,16 @@ public Builder db(String db) {
       return this;
     }
 
+    public Builder warehouse(String warehouse) {
+      this.warehouse = warehouse;
+      return this;
+    }
+
+    public Builder schema(String schema) {
+      this.schema = schema;
+      return this;
+    }
+
     public Builder host(String host) {
       this.host = host;
       return this;
@@ -120,7 +142,18 @@ public Builder port(Integer port) {
     }
 
     public DBInfo build() {
-      return new DBInfo(type, subtype, fullPropagationSupport, url, user, instance, db, host, port);
+      return new DBInfo(
+          type,
+          subtype,
+          fullPropagationSupport,
+          url,
+          user,
+          instance,
+          db,
+          host,
+          port,
+          warehouse,
+          schema);
     }
   }
 
@@ -160,8 +193,27 @@ public Integer getPort() {
     return port;
   }
 
+  public String getWarehouse() {
+    return warehouse;
+  }
+
+  public String getSchema() {
+    return schema;
+  }
+
   public Builder toBuilder() {
-    return new Builder(type, subtype, fullPropagationSupport, url, user, instance, db, host, port);
+    return new Builder(
+        type,
+        subtype,
+        fullPropagationSupport,
+        url,
+        user,
+        instance,
+        db,
+        host,
+        port,
+        warehouse,
+        schema);
   }
 
   @Override
@@ -177,11 +229,24 @@ public boolean equals(Object o) {
         && Objects.equals(instance, dbInfo.instance)
         && Objects.equals(db, dbInfo.db)
         && Objects.equals(host, dbInfo.host)
-        && Objects.equals(port, dbInfo.port);
+        && Objects.equals(port, dbInfo.port)
+        && Objects.equals(warehouse, dbInfo.warehouse)
+        && Objects.equals(schema, dbInfo.schema);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(type, subtype, fullPropagationSupport, url, user, instance, db, host, port);
+    return Objects.hash(
+        type,
+        subtype,
+        fullPropagationSupport,
+        url,
+        user,
+        instance,
+        db,
+        host,
+        port,
+        warehouse,
+        schema);
   }
 }

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java

@@ -770,6 +770,17 @@ DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
       }
       return builder;
     }
+  },
+
+  SNOWFLAKE("snowflake") {
+    @Override
+    DBInfo.Builder doParse(String jdbcUrl, DBInfo.Builder builder) {
+      String url = jdbcUrl;
+      if (url.startsWith("jdbc:")) {
+        url = url.substring(5);
+      }
+      return GENERIC_URL_LIKE.doParse(url, builder);
+    }
   };
 
   private static final Map<String, JDBCConnectionUrlParser> typeParsers = new HashMap<>();
@@ -876,7 +887,15 @@ private static void populateStandardProperties(
       if (props.containsKey("databaseName")) {
         builder.db((String) props.get("databaseName"));
       }
-
+      if (props.containsKey("db")) {
+        builder.db((String) props.get("db"));
+      }
+      if (props.containsKey("warehouse")) {
+        builder.warehouse((String) props.get("warehouse"));
+      }
+      if (props.containsKey("schema")) {
+        builder.schema((String) props.get("schema"));
+      }
       if (props.containsKey("servername")) {
         builder.host((String) props.get("servername"));
       }

dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/DDElementMatchers.java

@@ -23,21 +23,21 @@ public static void registerAsSupplier() {
   @Override
   @SuppressForbidden
   public ElementMatcher.Junction<TypeDescription> declaresAnnotation(
-      ElementMatcher.Junction<? super NamedElement> matcher) {
+      ElementMatcher<? super NamedElement> matcher) {
     return ElementMatchers.isAnnotatedWith(matcher);
   }
 
   @Override
   @SuppressForbidden
   public ElementMatcher.Junction<TypeDescription> declaresField(
-      ElementMatcher.Junction<? super FieldDescription> matcher) {
+      ElementMatcher<? super FieldDescription> matcher) {
     return ElementMatchers.declaresField(matcher);
   }
 
   @Override
   @SuppressForbidden
   public ElementMatcher.Junction<TypeDescription> declaresMethod(
-      ElementMatcher.Junction<? super MethodDescription> matcher) {
+      ElementMatcher<? super MethodDescription> matcher) {
     return ElementMatchers.declaresMethod(matcher);
   }
 
@@ -49,31 +49,31 @@ public ElementMatcher.Junction<TypeDescription> concreteClass() {
 
   @Override
   public ElementMatcher.Junction<TypeDescription> extendsClass(
-      ElementMatcher.Junction<? super TypeDescription> matcher) {
+      ElementMatcher<? super TypeDescription> matcher) {
     return new SafeHasSuperTypeMatcher<>(matcher, false, true, false);
   }
 
   @Override
   public ElementMatcher.Junction<TypeDescription> implementsInterface(
-      ElementMatcher.Junction<? super TypeDescription> matcher) {
+      ElementMatcher<? super TypeDescription> matcher) {
     return new SafeHasSuperTypeMatcher<>(matcher, true, true, true);
   }
 
   @Override
   public ElementMatcher.Junction<TypeDescription> hasInterface(
-      ElementMatcher.Junction<? super TypeDescription> matcher) {
+      ElementMatcher<? super TypeDescription> matcher) {
     return new SafeHasSuperTypeMatcher<>(matcher, true, false, true);
   }
 
   @Override
   public ElementMatcher.Junction<TypeDescription> hasSuperType(
-      ElementMatcher.Junction<? super TypeDescription> matcher) {
+      ElementMatcher<? super TypeDescription> matcher) {
     return new SafeHasSuperTypeMatcher<>(matcher, false, true, true);
   }
 
   @Override
   public ElementMatcher.Junction<MethodDescription> hasSuperMethod(
-      ElementMatcher.Junction<? super MethodDescription> matcher) {
+      ElementMatcher<? super MethodDescription> matcher) {
     return new HasSuperMethodMatcher<>(matcher);
   }
 

dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryExpression.java

@@ -21,7 +21,7 @@ public BinaryExpression(
 
   @Override
   public Boolean evaluate(ValueReferenceResolver valueRefResolver) {
-    return operator.apply(left.evaluate(valueRefResolver), right.evaluate(valueRefResolver));
+    return operator.apply(left, right, valueRefResolver);
   }
 
   @Override

dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/BinaryOperator.java

@@ -1,18 +1,21 @@
 package com.datadog.debugger.el.expressions;
 
 import com.datadog.debugger.el.Visitor;
+import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
 
 public enum BinaryOperator {
   AND("&&") {
     @Override
-    public Boolean apply(Boolean left, Boolean right) {
-      return left && right;
+    public Boolean apply(
+        BooleanExpression left, BooleanExpression right, ValueReferenceResolver resolver) {
+      return left.evaluate(resolver) && right.evaluate(resolver);
     }
   },
   OR("||") {
     @Override
-    public Boolean apply(Boolean left, Boolean right) {
-      return left || right;
+    public Boolean apply(
+        BooleanExpression left, BooleanExpression right, ValueReferenceResolver resolver) {
+      return left.evaluate(resolver) || right.evaluate(resolver);
     }
   };
 
@@ -22,7 +25,8 @@ public Boolean apply(Boolean left, Boolean right) {
     this.symbol = symbol;
   }
 
-  public abstract Boolean apply(Boolean left, Boolean right);
+  public abstract Boolean apply(
+      BooleanExpression left, BooleanExpression right, ValueReferenceResolver resolver);
 
   public <R> R accept(Visitor<R> visitor) {
     return visitor.visit(this);

dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/BinaryExpressionTest.java

@@ -3,8 +3,10 @@
 import static com.datadog.debugger.el.PrettyPrintVisitor.print;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.datadog.debugger.el.RefResolverHelper;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 class BinaryExpressionTest {
@@ -23,4 +25,26 @@ void testRightNull() {
     assertFalse(expression.evaluate(RefResolverHelper.createResolver(this)));
     assertEquals("true && false", print(expression));
   }
+
+  @Test
+  void testShortCircuitAnd() {
+    BinaryExpression expression =
+        new BinaryExpression(
+            BooleanExpression.FALSE,
+            valueRefResolver -> Assertions.fail("should not reach"),
+            BinaryOperator.AND);
+    assertFalse(expression.evaluate(RefResolverHelper.createResolver(this)));
+    assertEquals("false && null", print(expression));
+  }
+
+  @Test
+  void testShortCircuitOr() {
+    BinaryExpression expression =
+        new BinaryExpression(
+            BooleanExpression.TRUE,
+            valueRefResolver -> Assertions.fail("should not reach"),
+            BinaryOperator.OR);
+    assertTrue(expression.evaluate(RefResolverHelper.createResolver(this)));
+    assertEquals("true || null", print(expression));
+  }
 }

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java

@@ -1121,6 +1121,29 @@ public void nullCondition() throws IOException, URISyntaxException {
         "Cannot dereference to field: fld", evaluationErrors.get(0).getMessage());
   }
 
+  @Test
+  public void shortCircuitingCondition() throws IOException, URISyntaxException {
+    final String CLASS_NAME = "CapturedSnapshot08";
+    LogProbe logProbes =
+        createProbeBuilder(PROBE_ID, CLASS_NAME, "doit", "int (java.lang.String)")
+            .when(
+                new ProbeCondition(
+                    DSL.when(
+                        DSL.and(
+                            DSL.isDefined(DSL.ref("@exception")),
+                            DSL.contains(
+                                DSL.getMember(DSL.ref("@exception"), "detailMessage"),
+                                new StringValue("closed")))),
+                    "isDefined(@exception) && contains(@exception.detailMessage, 'closed')"))
+            .build();
+    TestSnapshotListener listener = installProbes(CLASS_NAME, logProbes);
+    Class<?> testClass = compileAndLoadClass(CLASS_NAME);
+    int result = Reflect.onClass(testClass).call("main", "1").get();
+    assertEquals(3, result);
+    // no snapshot, no eval error, isDefined returns false and do not evaluate the second part
+    assertEquals(0, listener.snapshots.size());
+  }
+
   @Test
   public void wellKnownClassesCondition() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot08";

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeInstrumentationTest.java

@@ -81,7 +81,7 @@ public void before() {
     ProbeRateLimiter.setSamplerSupplier(rate -> rate < 101 ? probeSampler : globalSampler);
     ProbeRateLimiter.setGlobalSnapshotRate(1000);
     // to activate the call to DebuggerContext.handleException
-    setFieldInConfig(Config.get(), "debuggerEnabled", true);
+    setFieldInConfig(Config.get(), "debuggerExceptionEnabled", true);
   }
 
   @AfterEach