diff --git a/instrumentation/anorm-2.0/build.gradle b/instrumentation/anorm-2.0/build.gradle deleted file mode 100644 index ff014fed42..0000000000 --- a/instrumentation/anorm-2.0/build.gradle +++ /dev/null @@ -1,39 +0,0 @@ -apply plugin: 'scala' - -dependencies { - implementation(project(":newrelic-api")) - implementation(project(":agent-bridge")) - implementation(project(":newrelic-weaver-api")) - implementation("org.scala-lang:scala-library:2.10.7") - implementation("com.typesafe.play:anorm_2.10:2.3.9") -} - -jar { - manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.anorm-2.0' } -} - -/* - * This list is derived from the versions available in: - * http://dl.bintray.com/typesafe/maven-releases/com/typesafe/play/anorm_2.10/ - * http://dl.bintray.com/typesafe/maven-releases/com/typesafe/play/anorm_2.11/ - * - * We need to support as many as we can, but generally we want to focus only on - * releases, not point builds. - * - * Note that we don't officially pas - */ -verifyInstrumentation { - // compiled with scala 2.10 - passes 'com.typesafe.play:anorm_2.10:[2.0,2.3-M1)' - // compiled with scala 2.11 - passes 'com.typesafe.play:anorm_2.11:[2.0,2.3-M1)' - - exclude 'com.typesafe.play:anorm_2.11:2.3.2-RC1' - exclude 'com.typesafe.play:anorm_2.11:2.3.8-4c54458f5e54ff63ff58554de5f6099ecede7cd1' - -} - -site { - title 'Anorm' - type 'Datastore' -} \ No newline at end of file diff --git a/instrumentation/anorm-2.0/src/main/scala/anorm/Anorm.scala b/instrumentation/anorm-2.0/src/main/scala/anorm/Anorm.scala deleted file mode 100644 index 3644e27f80..0000000000 --- a/instrumentation/anorm-2.0/src/main/scala/anorm/Anorm.scala +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * * Copyright 2020 New Relic Corporation. All rights reserved. - * * SPDX-License-Identifier: Apache-2.0 - * - */ - -package anorm - -import com.newrelic.api.agent.weaver.{MatchType,Weave,Weaver,NewField} -import com.newrelic.agent.bridge.AgentBridge -import com.newrelic.api.agent.Trace -import com.newrelic.api.agent.TransactionNamePriority -import java.sql.ResultSet -import java.util.logging.Level - -/** - * We want to trace on the 'object Sql' in anorm, not the 'trait Sql', which are both defined in the - * anorm package. In Scala, an 'object' is a approximately a Singleton instance of a type. A 'trait' - * is approximately like an interface in Java8 with default implementations, providing multiple - * inheritance of a kind. Unfortunately, Anorm uses name overloading, which makes this a little - * confusing, to tease out which of Sql$.class, Sql.class or Sql$class.class is desired. In this - * case, "Sql$.class" maps to the 'object Sql' we want to instrument. - * - * Note that weaving against 'object Sql' might not work... - * - * Created by thoffman on 9/14/15. - */ -@Weave(`type` = MatchType.ExactClass) -class Sql$ { - - @Trace(metricName = "ANorm/ResultSetParsing") - def as[T](parser: ResultSetParser[T], rs: ResultSet): T = { - // It would be clever to figure out the SQL statement, - return Weaver.callOriginal(); - } - -} - -object NewRelicConstants { - val ANORM_CONTROLLER_ACTION: String = "AnormControllerAction" -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index b459683bee..e273321659 100644 --- a/settings.gradle +++ b/settings.gradle @@ -46,7 +46,6 @@ if (JavaVersion.current().isJava11Compatible()) { } // Weaver Instrumentation -include 'instrumentation:anorm-2.0' include 'instrumentation:anorm-2.3' include 'instrumentation:anorm-2.4' include 'instrumentation:aws-java-sdk-sqs-1.10.44'