From c97f21e8dfde025114c08e67492ac157436d4a71 Mon Sep 17 00:00:00 2001 From: Monu Lakshkar Date: Thu, 21 Sep 2023 12:09:45 +0530 Subject: [PATCH] Renamed package --- .../security/instrumentation}/grpc1400/GrpcClientUtils.java | 2 +- .../security/instrumentation}/grpc1400/GrpcServerUtils.java | 4 +--- .../agent/security/instrumentation}/grpc1400/GrpcUtils.java | 5 +---- .../instrumentation}/grpc1400/ProtoMessageToMap.java | 2 +- .../src/main/java/io/grpc/ClientCall_Instrumentation.java | 2 +- .../java/io/grpc/ServerCallListener_Instrumentation.java | 2 +- .../io/grpc/internal/ServerCallImpl_Instrumentation.java | 4 ++-- .../java/io/grpc/internal/ServerImpl_Instrumentation.java | 2 +- 8 files changed, 9 insertions(+), 14 deletions(-) rename instrumentation-security/grpc-1.40.0/src/main/java/com/{nr/instrumentation/security => newrelic/agent/security/instrumentation}/grpc1400/GrpcClientUtils.java (98%) rename instrumentation-security/grpc-1.40.0/src/main/java/com/{nr/instrumentation/security => newrelic/agent/security/instrumentation}/grpc1400/GrpcServerUtils.java (98%) rename instrumentation-security/grpc-1.40.0/src/main/java/com/{nr/instrumentation/security => newrelic/agent/security/instrumentation}/grpc1400/GrpcUtils.java (95%) rename instrumentation-security/grpc-1.40.0/src/main/java/com/{nr/instrumentation/security => newrelic/agent/security/instrumentation}/grpc1400/ProtoMessageToMap.java (97%) diff --git a/instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/GrpcClientUtils.java b/instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/GrpcClientUtils.java similarity index 98% rename from instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/GrpcClientUtils.java rename to instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/GrpcClientUtils.java index 87d808c4f..e34d820e0 100644 --- a/instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/GrpcClientUtils.java +++ b/instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/GrpcClientUtils.java @@ -1,4 +1,4 @@ -package com.nr.instrumentation.security.grpc1400; +package com.newrelic.agent.security.instrumentation.grpc1400; import com.newrelic.api.agent.security.NewRelicSecurity; import com.newrelic.api.agent.security.instrumentation.helpers.ServletHelper; diff --git a/instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/GrpcServerUtils.java b/instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/GrpcServerUtils.java similarity index 98% rename from instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/GrpcServerUtils.java rename to instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/GrpcServerUtils.java index e18213410..75d446e2d 100644 --- a/instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/GrpcServerUtils.java +++ b/instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/GrpcServerUtils.java @@ -1,4 +1,4 @@ -package com.nr.instrumentation.security.grpc1400; +package com.newrelic.agent.security.instrumentation.grpc1400; import com.newrelic.api.agent.security.NewRelicSecurity; import com.newrelic.api.agent.security.instrumentation.helpers.GrpcHelper; @@ -21,8 +21,6 @@ import java.net.URISyntaxException; import java.util.Map; import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class GrpcServerUtils { private static final String X_FORWARDED_FOR = "x-forwarded-for"; diff --git a/instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/GrpcUtils.java b/instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/GrpcUtils.java similarity index 95% rename from instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/GrpcUtils.java rename to instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/GrpcUtils.java index 61a307662..1fb65d32d 100644 --- a/instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/GrpcUtils.java +++ b/instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/GrpcUtils.java @@ -1,13 +1,10 @@ -package com.nr.instrumentation.security.grpc1400; +package com.newrelic.agent.security.instrumentation.grpc1400; -import com.google.protobuf.Descriptors; import com.google.protobuf.MessageOrBuilder; import com.newrelic.api.agent.security.NewRelicSecurity; import com.newrelic.api.agent.security.instrumentation.helpers.GrpcHelper; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/ProtoMessageToMap.java b/instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/ProtoMessageToMap.java similarity index 97% rename from instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/ProtoMessageToMap.java rename to instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/ProtoMessageToMap.java index aa39fa29a..929d5439e 100644 --- a/instrumentation-security/grpc-1.40.0/src/main/java/com/nr/instrumentation/security/grpc1400/ProtoMessageToMap.java +++ b/instrumentation-security/grpc-1.40.0/src/main/java/com/newrelic/agent/security/instrumentation/grpc1400/ProtoMessageToMap.java @@ -1,4 +1,4 @@ -package com.nr.instrumentation.security.grpc1400; +package com.newrelic.agent.security.instrumentation.grpc1400; import com.google.protobuf.Descriptors; import com.google.protobuf.MapEntry; diff --git a/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/ClientCall_Instrumentation.java b/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/ClientCall_Instrumentation.java index 70c5f52b1..0f74462dc 100644 --- a/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/ClientCall_Instrumentation.java +++ b/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/ClientCall_Instrumentation.java @@ -5,7 +5,7 @@ import com.newrelic.api.agent.weaver.NewField; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.nr.instrumentation.security.grpc1400.GrpcClientUtils; +import com.newrelic.agent.security.instrumentation.grpc1400.GrpcClientUtils; import java.net.URI; import java.net.URISyntaxException; diff --git a/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java b/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java index 0d42b246f..992ec87a4 100644 --- a/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java +++ b/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/ServerCallListener_Instrumentation.java @@ -3,7 +3,7 @@ import com.newrelic.api.agent.weaver.MatchType; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.nr.instrumentation.security.grpc1400.GrpcUtils; +import com.newrelic.agent.security.instrumentation.grpc1400.GrpcUtils; @Weave(type = MatchType.BaseClass, originalName = "io.grpc.ServerCall") public class ServerCallListener_Instrumentation { diff --git a/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/internal/ServerCallImpl_Instrumentation.java b/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/internal/ServerCallImpl_Instrumentation.java index 935dd12cb..02a7c1625 100644 --- a/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/internal/ServerCallImpl_Instrumentation.java +++ b/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/internal/ServerCallImpl_Instrumentation.java @@ -10,8 +10,8 @@ import com.newrelic.api.agent.Trace; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.nr.instrumentation.security.grpc1400.GrpcServerUtils; -import com.nr.instrumentation.security.grpc1400.GrpcUtils; +import com.newrelic.agent.security.instrumentation.grpc1400.GrpcServerUtils; +import com.newrelic.agent.security.instrumentation.grpc1400.GrpcUtils; import io.grpc.Metadata; import io.grpc.Status; diff --git a/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/internal/ServerImpl_Instrumentation.java b/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/internal/ServerImpl_Instrumentation.java index f41463653..b55b497aa 100644 --- a/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/internal/ServerImpl_Instrumentation.java +++ b/instrumentation-security/grpc-1.40.0/src/main/java/io/grpc/internal/ServerImpl_Instrumentation.java @@ -10,7 +10,7 @@ import com.newrelic.api.agent.weaver.NewField; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.nr.instrumentation.security.grpc1400.GrpcServerUtils; +import com.newrelic.agent.security.instrumentation.grpc1400.GrpcServerUtils; import io.grpc.Metadata; import io.grpc.ServerMethodDefinition; import io.perfmark.Tag;