diff --git a/instrumentation/thrift-0.8/build.gradle b/instrumentation/thrift-0.8/build.gradle deleted file mode 100644 index c17ca5f2bf..0000000000 --- a/instrumentation/thrift-0.8/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ - -dependencies { - implementation(project(":agent-bridge")) - implementation("org.apache.thrift:libthrift:0.8.0") -} - -jar { - manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.thrift-0.8' } -} - -verifyInstrumentation { - passes 'org.apache.thrift:libthrift:[0.8.0,)' -} - -site { - title 'Thrift' - type 'Framework' -} \ No newline at end of file diff --git a/instrumentation/thrift-0.8/src/main/java/org/apache/thrift/ProcessFunction.java b/instrumentation/thrift-0.8/src/main/java/org/apache/thrift/ProcessFunction.java deleted file mode 100644 index 606b9a9507..0000000000 --- a/instrumentation/thrift-0.8/src/main/java/org/apache/thrift/ProcessFunction.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * - * * Copyright 2020 New Relic Corporation. All rights reserved. - * * SPDX-License-Identifier: Apache-2.0 - * - */ - -package org.apache.thrift; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.thrift.protocol.TProtocol; - -import com.newrelic.api.agent.NewRelic; -import com.newrelic.api.agent.Trace; -import com.newrelic.api.agent.TransactionNamePriority; -import com.newrelic.api.agent.weaver.NewField; -import com.newrelic.api.agent.weaver.Weave; -import com.newrelic.api.agent.weaver.Weaver; - -@Weave -public abstract class ProcessFunction { - - @NewField - private static final Pattern PROCESSOR_PATTERN = Pattern.compile("(.*)\\$Processor\\$(.*)"); - - @Trace - public final void process(int seqid, TProtocol iprot, TProtocol oprot, I iface) throws TException { - String[] txName = classNameToTransactionName(this.getClass().getName()); - NewRelic.getAgent().getTransaction().setTransactionName(TransactionNamePriority.FRAMEWORK_HIGH, true, "Thrift", - txName); - Weaver.callOriginal(); - } - - private static String[] classNameToTransactionName(String className) { - - Matcher processorMatcher = PROCESSOR_PATTERN.matcher(className); - if (processorMatcher.matches()) { - return new String[] { processorMatcher.group(1), processorMatcher.group(2) }; - } else { - return new String[] { className }; - } - } -} diff --git a/settings.gradle b/settings.gradle index 98de464c6d..b02a307b77 100644 --- a/settings.gradle +++ b/settings.gradle @@ -435,7 +435,6 @@ include 'instrumentation:sttp-http4s-2.12_2.1.5' include 'instrumentation:sttp-http4s-2.13_2.1.5' include 'instrumentation:sttp-http4s-2.13_3.3.0' include 'instrumentation:sun-net-httpserver' -include 'instrumentation:thrift-0.8' include 'instrumentation:tomcat-7' include 'instrumentation:tomcat-7.0.70' include 'instrumentation:tomcat-8.5.0'