Revert "Merge pull request newrelic#538 from newrelic/spring-security"

This reverts commit 7980165, reversing
changes made to 1f4607e.

See newrelic#725.

instrumentation/netty-reactor-0.7.0/src/main/java/com/nr/instrumentation/TokenLinkingSubscriber.java

@@ -26,7 +26,7 @@ public class TokenLinkingSubscriber<T> implements CoreSubscriber<T> {
     public TokenLinkingSubscriber(Subscriber<? super T> subscriber, Context ctx) {
         this.subscriber = subscriber;
         this.context = ctx;
-        // newrelic-token is added by spring-webflux-5.1 instrumentation of ServerWebExchange
+        // newrelic-token is added by spring-webflux-5.1 instrumentation
         this.token = ctx.getOrDefault("newrelic-token", null);
     }
 

instrumentation/netty-reactor-0.8.0/src/main/java/com/nr/instrumentation/reactor/netty/TokenLinkingSubscriber.java

@@ -17,14 +17,8 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-/**
- * Implementation of a reactor.core.CoreSubscriber (a Context aware subscriber) that can be added as
- * a lifecycle hook on Flux/Mono operators to propagate, retrieve, and link Tokens across async contexts.
- *
- * Based on OpenTelemetry code:
- * https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/TracingSubscriber.java
- * @param <T>
- */
+// Based on OpenTelemetry code
+// https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/TracingSubscriber.java
 public class TokenLinkingSubscriber<T> implements CoreSubscriber<T> {
     private final Token token;
     private final Subscriber<? super T> subscriber;
@@ -33,7 +27,7 @@ public class TokenLinkingSubscriber<T> implements CoreSubscriber<T> {
     public TokenLinkingSubscriber(Subscriber<? super T> subscriber, Context ctx) {
         this.subscriber = subscriber;
         this.context = ctx;
-        // newrelic-token is added by spring-webflux instrumentation of ServerWebExchange
+        // newrelic-token is added by spring-webflux instrumentation
         this.token = ctx.getOrDefault("newrelic-token", null);
     }
 

instrumentation/netty-reactor-0.8.0/src/main/java/reactor/core/publisher/Hooks_Instrumentation.java

@@ -14,12 +14,6 @@
 
 @Weave(originalName = "reactor.core.publisher.Hooks")
 public abstract class Hooks_Instrumentation {
-
-    /*
-     * Note that sub-hooks are cumulative. We want to avoid setting the same sub-hooks
-     * more than once, so we set this boolean to true the first time we set a sub-hook.
-     * if (!Hooks_Instrumentation.instrumented.getAndSet(true)) { Hooks.onEachOperator(...) }
-     */
     @NewField
     public static AtomicBoolean instrumented = new AtomicBoolean(false);
 }

instrumentation/netty-reactor-0.8.0/src/main/java/reactor/core/scheduler/InstantPeriodicWorkerTask_Instrumentation.java

@@ -14,8 +14,6 @@
 @Weave(originalName = "reactor.core.scheduler.InstantPeriodicWorkerTask")
 final class InstantPeriodicWorkerTask_Instrumentation {
 
-    // We need to be able to link the Token here when executing on a supplied Scheduler
-    // A Token should be available on the thread that this task executes on if tokenLift() was added to Hooks.onEachOperator
     @Trace(async = true, excludeFromTransactionTrace = true)
     public Void call() {
         return Weaver.callOriginal();

instrumentation/netty-reactor-0.8.0/src/main/java/reactor/core/scheduler/PeriodicWorkerTask_Instrumentation.java

@@ -14,8 +14,6 @@
 @Weave(originalName = "reactor.core.scheduler.PeriodicWorkerTask")
 final class PeriodicWorkerTask_Instrumentation {
 
-    // We need to be able to link the Token here when executing on a supplied Scheduler
-    // A Token should be available on the thread that this task executes on if tokenLift() was added to Hooks.onEachOperator
     @Trace(async = true, excludeFromTransactionTrace = true)
     public Void call() {
         return Weaver.callOriginal();

instrumentation/netty-reactor-0.8.0/src/main/java/reactor/core/scheduler/SchedulerTask_Instrumentation.java

@@ -15,7 +15,6 @@
 final class SchedulerTask_Instrumentation {
 
     // We need to be able to link the Token here when executing on a supplied Scheduler via Mono::publishOn
-    // A Token should be available on the thread that this task executes on if tokenLift() was added to Hooks.onEachOperator
     @Trace(async = true, excludeFromTransactionTrace = true)
     public Void call() {
         return Weaver.callOriginal();

instrumentation/netty-reactor-0.8.0/src/main/java/reactor/core/scheduler/WorkerTask_Instrumentation.java

@@ -14,8 +14,6 @@
 @Weave(originalName = "reactor.core.scheduler.WorkerTask")
 final class WorkerTask_Instrumentation {
 
-    // We need to be able to link the Token here when executing on a supplied Scheduler
-    // A Token should be available on the thread that this task executes on if tokenLift() was added to Hooks.onEachOperator
     @Trace(async = true, excludeFromTransactionTrace = true)
     public Void call() {
         return Weaver.callOriginal();

instrumentation/netty-reactor-0.8.0/src/main/java/reactor/netty/http/server/HttpTrafficHandler_Instrumentation.java

@@ -19,14 +19,6 @@
 @Weave(originalName = "reactor.netty.http.server.HttpTrafficHandler")
 class HttpTrafficHandler_Instrumentation {
     public void channelRead(ChannelHandlerContext ctx, Object msg) {
-
-        /*
-         * Add tokenLift hook if it hasn't already been added. This allows for tokens to be retrieved from
-         * the current context and linked across threads at various points of the Flux/Mono lifecycle.
-         *
-         * This hook will only be added when using Netty Reactor with SpringBoot. When using other embedded web
-         * servers (e.g. Tomcat, Jetty, Undertow) the Schedulers_Instrumentation class will add the hook.
-         */
         if (!Hooks_Instrumentation.instrumented.getAndSet(true)) {
             Hooks.onEachOperator(TokenLinkingSubscriber.class.getName(), tokenLift());
         }

instrumentation/netty-reactor-0.9.0/src/main/java/com/nr/instrumentation/reactor/netty/TokenLinkingSubscriber.java

@@ -17,14 +17,8 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-/**
- * Implementation of a reactor.core.CoreSubscriber (a Context aware subscriber) that can be added as
- * a lifecycle hook on Flux/Mono operators to propagate, retrieve, and link Tokens across async contexts.
- *
- * Based on OpenTelemetry code:
- * https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/TracingSubscriber.java
- * @param <T>
- */
+// Based on OpenTelemetry code
+// https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/TracingSubscriber.java
 public class TokenLinkingSubscriber<T> implements CoreSubscriber<T> {
     private final Token token;
     private final Subscriber<? super T> subscriber;
@@ -33,7 +27,7 @@ public class TokenLinkingSubscriber<T> implements CoreSubscriber<T> {
     public TokenLinkingSubscriber(Subscriber<? super T> subscriber, Context ctx) {
         this.subscriber = subscriber;
         this.context = ctx;
-        // newrelic-token is added by spring-webflux instrumentation of ServerWebExchange
+        // newrelic-token is added by spring-webflux instrumentation
         this.token = ctx.getOrDefault("newrelic-token", null);
     }
 

instrumentation/netty-reactor-0.9.0/src/main/java/reactor/core/publisher/Hooks_Instrumentation.java

@@ -14,12 +14,6 @@
 
 @Weave(originalName = "reactor.core.publisher.Hooks")
 public abstract class Hooks_Instrumentation {
-
-    /*
-     * Note that sub-hooks are cumulative. We want to avoid setting the same sub-hooks
-     * more than once, so we set this boolean to true the first time we set a sub-hook.
-     * if (!Hooks_Instrumentation.instrumented.getAndSet(true)) { Hooks.onEachOperator(...) }
-     */
     @NewField
     public static AtomicBoolean instrumented = new AtomicBoolean(false);
 }

instrumentation/netty-reactor-0.9.0/src/main/java/reactor/core/scheduler/InstantPeriodicWorkerTask_Instrumentation.java

@@ -14,8 +14,6 @@
 @Weave(originalName = "reactor.core.scheduler.InstantPeriodicWorkerTask")
 final class InstantPeriodicWorkerTask_Instrumentation {
 
-    // We need to be able to link the Token here when executing on a supplied Scheduler
-    // A Token should be available on the thread that this task executes on if tokenLift() was added to Hooks.onEachOperator
     @Trace(async = true, excludeFromTransactionTrace = true)
     public Void call() {
         return Weaver.callOriginal();

instrumentation/netty-reactor-0.9.0/src/main/java/reactor/core/scheduler/PeriodicWorkerTask_Instrumentation.java

@@ -14,8 +14,6 @@
 @Weave(originalName = "reactor.core.scheduler.PeriodicWorkerTask")
 final class PeriodicWorkerTask_Instrumentation {
 
-    // We need to be able to link the Token here when executing on a supplied Scheduler
-    // A Token should be available on the thread that this task executes on if tokenLift() was added to Hooks.onEachOperator
     @Trace(async = true, excludeFromTransactionTrace = true)
     public Void call() {
         return Weaver.callOriginal();

instrumentation/netty-reactor-0.9.0/src/main/java/reactor/core/scheduler/SchedulerTask_Instrumentation.java

@@ -15,7 +15,6 @@
 final class SchedulerTask_Instrumentation {
 
     // We need to be able to link the Token here when executing on a supplied Scheduler via Mono::publishOn
-    // A Token should be available on the thread that this task executes on if tokenLift() was added to Hooks.onEachOperator
     @Trace(async = true, excludeFromTransactionTrace = true)
     public Void call() {
         return Weaver.callOriginal();

instrumentation/netty-reactor-0.9.0/src/main/java/reactor/core/scheduler/WorkerTask_Instrumentation.java

@@ -14,8 +14,6 @@
 @Weave(originalName = "reactor.core.scheduler.WorkerTask")
 final class WorkerTask_Instrumentation {
 
-    // We need to be able to link the Token here when executing on a supplied Scheduler
-    // A Token should be available on the thread that this task executes on if tokenLift() was added to Hooks.onEachOperator
     @Trace(async = true, excludeFromTransactionTrace = true)
     public Void call() {
         return Weaver.callOriginal();

instrumentation/netty-reactor-0.9.0/src/main/java/reactor/netty/http/server/HttpTrafficHandler_Instrumentation.java

@@ -19,14 +19,6 @@
 @Weave(originalName = "reactor.netty.http.server.HttpTrafficHandler")
 class HttpTrafficHandler_Instrumentation {
     public void channelRead(ChannelHandlerContext ctx, Object msg) {
-
-        /*
-         * Add tokenLift hook if it hasn't already been added. This allows for tokens to be retrieved from
-         * the current context and linked across threads at various points of the Flux/Mono lifecycle.
-         *
-         * This hook will only be added when using Netty Reactor with SpringBoot. When using other embedded web
-         * servers (e.g. Tomcat, Jetty, Undertow) the Schedulers_Instrumentation class will add the hook.
-         */
         if (!Hooks_Instrumentation.instrumented.getAndSet(true)) {
             Hooks.onEachOperator(TokenLinkingSubscriber.class.getName(), tokenLift());
         }