cleanup

newrelic-experimental · Apr 30, 2024 · 78971ef · 78971ef
1 parent 5c020db
commit 78971ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/sap-jdbc-dbtech/src/main/java/com/newrelic/instrumentation/labs/sap/dbtech/Utils.java b/sap-jdbc-dbtech/src/main/java/com/newrelic/instrumentation/labs/sap/dbtech/Utils.java
@@ -36,6 +36,7 @@ public static void init() {
 			parser = (DefaultDatabaseStatementParser)dbService.getDatabaseStatementParser();
 			initialized  = true;
 		}
+		vendor = new SAPDBVendor();
 	}
 
 	private static String getSAPHost(String url) {
@@ -176,8 +177,11 @@ public static ParsedDatabaseStatement parseSQL(String sql) {
 		}
 
 		if(initialized) {
-			ParsedDatabaseStatement statement = parser.getParsedDatabaseStatement(vendor, sql, null);
-			return statement;
+
+			if (vendor != null && sql != null) {
+				ParsedDatabaseStatement statement = parser.getParsedDatabaseStatement(vendor, sql, null);
+				return statement;
+			}
 		}
 
 		return null;

diff --git a/sap-jmxdumper/build.gradle b/sap-jmxdumper/build.gradle
@@ -1,9 +1,5 @@
 
-<<<<<<<< HEAD:sap-jmxdumper/build.gradle
 // Build.gradle generated for instrumentation module sap-jmxdumper
-========
-// Build.gradle generated for instrumentation module sap-appnaming
->>>>>>>> main:sap-appnaming/build.gradle
 
 apply plugin: 'java'
 
@@ -22,11 +18,7 @@ dependencies {
 
 jar {
   manifest {
-<<<<<<<< HEAD:sap-jmxdumper/build.gradle
     attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.sap-jmxdumper'
-========
-    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.sap-appnaming'
->>>>>>>> main:sap-appnaming/build.gradle
     attributes 'Implementation-Vendor': 'New Relic Labs'
     attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
     attributes 'Implementation-Version': 1.0