diff --git a/instrumentation/jdbc-inet-merlia/README.md b/instrumentation/jdbc-inet-merlia/README.md deleted file mode 100644 index 1b478b4387..0000000000 --- a/instrumentation/jdbc-inet-merlia/README.md +++ /dev/null @@ -1,12 +0,0 @@ -## Building - -New Relic does not distribute the jar(s) required to build this instrumentation module nor are they available from a public repository such as Maven Central or jcenter. - -To build this instrumentation module you must provide the jar(s) and place them into the `/lib` subdirectory as follows: - -```groovy -instrumentation/jdbc-inet-merlia/lib/merlia-7.03.jar -``` - -## Required jar versions -`merlia` - 7.03 or above diff --git a/instrumentation/jdbc-inet-merlia/build.gradle b/instrumentation/jdbc-inet-merlia/build.gradle deleted file mode 100644 index 853a2ff07a..0000000000 --- a/instrumentation/jdbc-inet-merlia/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -dependencies { - implementation(project(":agent-bridge")) - implementation(project(":agent-bridge-datastore")) - implementation(fileTree(include: ["*.jar"], dir: "lib")) -} - -def shouldBuild = fileTree(include: ["*.jar"], dir: "lib").size() > 0 - -compileJava { - enabled(shouldBuild) -} - -compileTestJava { - enabled(shouldBuild) -} - -tasks.getByName("writeCachedWeaveAttributes").enabled(shouldBuild) - -jar { - enabled(shouldBuild) - manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.jdbc-inet-merlia' } -} - -site { - title 'Merlia' - type 'Datastore' - versionOverride '[7.03,)' -} \ No newline at end of file diff --git a/instrumentation/jdbc-inet-merlia/lib/.gitignore b/instrumentation/jdbc-inet-merlia/lib/.gitignore deleted file mode 100644 index c96a04f008..0000000000 --- a/instrumentation/jdbc-inet-merlia/lib/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/instrumentation/jdbc-inet-merlia/src/main/java/com/inet/tds/TdsDataSource.java b/instrumentation/jdbc-inet-merlia/src/main/java/com/inet/tds/TdsDataSource.java deleted file mode 100644 index 8dbe0203f9..0000000000 --- a/instrumentation/jdbc-inet-merlia/src/main/java/com/inet/tds/TdsDataSource.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * - * * Copyright 2020 New Relic Corporation. All rights reserved. - * * SPDX-License-Identifier: Apache-2.0 - * - */ - -package com.inet.tds; - -import java.sql.Connection; - -import com.newrelic.agent.bridge.datastore.JdbcHelper; -import com.newrelic.api.agent.weaver.MatchType; -import com.newrelic.api.agent.weaver.Weave; -import com.newrelic.api.agent.weaver.Weaver; -import com.nr.agent.instrumentation.jdbc.inet.merlia.MerliaDatabaseVendor; - -@Weave(type = MatchType.BaseClass) -public abstract class TdsDataSource { - - public Connection getConnection() { - JdbcHelper.putVendor(getClass(), MerliaDatabaseVendor.INSTANCE); - return Weaver.callOriginal(); - } - - public Connection getConnection(String user, String password) { - JdbcHelper.putVendor(getClass(), MerliaDatabaseVendor.INSTANCE); - return Weaver.callOriginal(); - } -} \ No newline at end of file diff --git a/instrumentation/jdbc-inet-merlia/src/main/java/com/inet/tds/TdsDriver.java b/instrumentation/jdbc-inet-merlia/src/main/java/com/inet/tds/TdsDriver.java deleted file mode 100644 index bb3e7a6d3b..0000000000 --- a/instrumentation/jdbc-inet-merlia/src/main/java/com/inet/tds/TdsDriver.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * - * * Copyright 2020 New Relic Corporation. All rights reserved. - * * SPDX-License-Identifier: Apache-2.0 - * - */ - -package com.inet.tds; - -import java.sql.Connection; -import java.sql.Driver; -import java.sql.SQLException; -import java.util.Properties; - -import com.newrelic.agent.bridge.datastore.JdbcHelper; -import com.newrelic.api.agent.weaver.Weave; -import com.newrelic.api.agent.weaver.Weaver; -import com.nr.agent.instrumentation.jdbc.inet.merlia.MerliaDatabaseVendor; - -@Weave -public abstract class TdsDriver { - - public Connection connect(String url, Properties props) { - JdbcHelper.putVendor(getClass(), MerliaDatabaseVendor.INSTANCE); - return Weaver.callOriginal(); - } - -} diff --git a/instrumentation/jdbc-inet-merlia/src/main/java/com/nr/agent/instrumentation/jdbc/inet/merlia/MerliaDatabaseVendor.java b/instrumentation/jdbc-inet-merlia/src/main/java/com/nr/agent/instrumentation/jdbc/inet/merlia/MerliaDatabaseVendor.java deleted file mode 100644 index 9d124ec63c..0000000000 --- a/instrumentation/jdbc-inet-merlia/src/main/java/com/nr/agent/instrumentation/jdbc/inet/merlia/MerliaDatabaseVendor.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * - * * Copyright 2020 New Relic Corporation. All rights reserved. - * * SPDX-License-Identifier: Apache-2.0 - * - */ - -package com.nr.agent.instrumentation.jdbc.inet.merlia; - -import com.newrelic.agent.bridge.datastore.DatabaseVendor; -import com.newrelic.agent.bridge.datastore.DatastoreVendor; -import com.newrelic.agent.bridge.datastore.JdbcDatabaseVendor; - -public class MerliaDatabaseVendor extends JdbcDatabaseVendor { - - public static final DatabaseVendor INSTANCE = new MerliaDatabaseVendor(); - - private MerliaDatabaseVendor() { - super("Microsoft SQL Server", "sqlserver", false); - } - - @Override - public DatastoreVendor getDatastoreVendor() { - return DatastoreVendor.MSSQL; - } - -} \ No newline at end of file diff --git a/instrumentation/jdbc-inet-oranxo/README.md b/instrumentation/jdbc-inet-oranxo/README.md deleted file mode 100644 index 3342194317..0000000000 --- a/instrumentation/jdbc-inet-oranxo/README.md +++ /dev/null @@ -1,12 +0,0 @@ -## Building - -New Relic does not distribute the jar(s) required to build this instrumentation module nor are they available from a public repository such as Maven Central or jcenter. - -To build this instrumentation module you must provide the jar(s) and place them into the `/lib` subdirectory as follows: - -```groovy -instrumentation/jdbc-inet-oranxo/lib/oranxo-3.06.jar -``` - -## Required jar versions -`oranxo` - 3.06 or above diff --git a/instrumentation/jdbc-inet-oranxo/build.gradle b/instrumentation/jdbc-inet-oranxo/build.gradle deleted file mode 100644 index cc35eb442e..0000000000 --- a/instrumentation/jdbc-inet-oranxo/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -dependencies { - implementation(project(":agent-bridge")) - implementation(project(":agent-bridge-datastore")) - implementation(fileTree(include: ["*.jar"], dir: "lib")) -} - -def shouldBuild = fileTree(include: ["*.jar"], dir: "lib").size() > 0 - -compileJava { - enabled(shouldBuild) -} - -compileTestJava { - enabled(shouldBuild) -} - -tasks.getByName("writeCachedWeaveAttributes").enabled(shouldBuild) - -jar { - enabled(shouldBuild) - manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.jdbc-inet-oranxo' } -} - -site { - title 'Oranxo' - type 'Datastore' - versionOverride '[3.06,)' -} \ No newline at end of file diff --git a/instrumentation/jdbc-inet-oranxo/lib/.gitignore b/instrumentation/jdbc-inet-oranxo/lib/.gitignore deleted file mode 100644 index c96a04f008..0000000000 --- a/instrumentation/jdbc-inet-oranxo/lib/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/instrumentation/jdbc-inet-oranxo/src/main/java/com/inet/ora/OraDataSource.java b/instrumentation/jdbc-inet-oranxo/src/main/java/com/inet/ora/OraDataSource.java deleted file mode 100644 index fd93b16b30..0000000000 --- a/instrumentation/jdbc-inet-oranxo/src/main/java/com/inet/ora/OraDataSource.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * - * * Copyright 2020 New Relic Corporation. All rights reserved. - * * SPDX-License-Identifier: Apache-2.0 - * - */ - -package com.inet.ora; - -import java.sql.Connection; - -import com.newrelic.agent.bridge.datastore.JdbcHelper; -import com.newrelic.api.agent.weaver.MatchType; -import com.newrelic.api.agent.weaver.Weave; -import com.newrelic.api.agent.weaver.Weaver; -import com.nr.agent.instrumentation.jdbc.inet.oranxo.INetOracleDatabaseVendor; - -@Weave(type = MatchType.BaseClass) -public abstract class OraDataSource { - - public Connection getConnection() { - JdbcHelper.putVendor(getClass(), INetOracleDatabaseVendor.INSTANCE); - return Weaver.callOriginal(); - } - - public Connection getConnection(String user, String password) { - JdbcHelper.putVendor(getClass(), INetOracleDatabaseVendor.INSTANCE); - return Weaver.callOriginal(); - } -} \ No newline at end of file diff --git a/instrumentation/jdbc-inet-oranxo/src/main/java/com/inet/ora/OraDriver.java b/instrumentation/jdbc-inet-oranxo/src/main/java/com/inet/ora/OraDriver.java deleted file mode 100644 index ac7bef3df1..0000000000 --- a/instrumentation/jdbc-inet-oranxo/src/main/java/com/inet/ora/OraDriver.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * - * * Copyright 2020 New Relic Corporation. All rights reserved. - * * SPDX-License-Identifier: Apache-2.0 - * - */ - -package com.inet.ora; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Properties; - -import com.newrelic.agent.bridge.datastore.JdbcHelper; -import com.newrelic.api.agent.weaver.Weave; -import com.newrelic.api.agent.weaver.Weaver; -import com.nr.agent.instrumentation.jdbc.inet.oranxo.INetOracleDatabaseVendor; - -@Weave -public abstract class OraDriver { - - public Connection connect(String url, Properties props) { - JdbcHelper.putVendor(getClass(), INetOracleDatabaseVendor.INSTANCE); - return Weaver.callOriginal(); - } - -} diff --git a/instrumentation/jdbc-inet-oranxo/src/main/java/com/nr/agent/instrumentation/jdbc/inet/oranxo/INetOracleDatabaseVendor.java b/instrumentation/jdbc-inet-oranxo/src/main/java/com/nr/agent/instrumentation/jdbc/inet/oranxo/INetOracleDatabaseVendor.java deleted file mode 100644 index 12df158fa8..0000000000 --- a/instrumentation/jdbc-inet-oranxo/src/main/java/com/nr/agent/instrumentation/jdbc/inet/oranxo/INetOracleDatabaseVendor.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * - * * Copyright 2020 New Relic Corporation. All rights reserved. - * * SPDX-License-Identifier: Apache-2.0 - * - */ - -package com.nr.agent.instrumentation.jdbc.inet.oranxo; - -import java.sql.SQLException; - -import com.newrelic.agent.bridge.datastore.DatabaseVendor; -import com.newrelic.agent.bridge.datastore.DatastoreVendor; -import com.newrelic.agent.bridge.datastore.JdbcDatabaseVendor; - -public class INetOracleDatabaseVendor extends JdbcDatabaseVendor { - - public static final DatabaseVendor INSTANCE = new INetOracleDatabaseVendor(); - - private INetOracleDatabaseVendor() { - super("Oracle", "oracle", false); // Explain plans not currently supported. - } - - @Override - public DatastoreVendor getDatastoreVendor() { - return DatastoreVendor.Oracle; - } - - @Override - public String getExplainPlanSql(String sql) throws SQLException { - return "EXPLAIN PLAN FOR " + sql; - } - -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 98de464c6d..1d92fe4257 100644 --- a/settings.gradle +++ b/settings.gradle @@ -190,8 +190,6 @@ include 'instrumentation:jdbc-generic' include 'instrumentation:jdbc-h2' include 'instrumentation:jdbc-hsqldb-1.7.2.2' include 'instrumentation:jdbc-hsqldb-2.2.9' -include 'instrumentation:jdbc-inet-merlia' -include 'instrumentation:jdbc-inet-oranxo' include 'instrumentation:jdbc-jtds' include 'instrumentation:jdbc-jtds-generic' include 'instrumentation:jdbc-mariadb-1.1.7'