[#noissue] Refactor ChannelzConfiguration

pinpoint-apm · Jul 11, 2024 · 0435aaf · 0435aaf
1 parent 03072f5
commit 0435aaf
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 34 deletions.
diff --git a/...ector/src/main/java/com/navercorp/pinpoint/collector/grpc/CollectorGrpcConfiguration.java b/...ector/src/main/java/com/navercorp/pinpoint/collector/grpc/CollectorGrpcConfiguration.java
@@ -18,6 +18,7 @@
 package com.navercorp.pinpoint.collector.grpc;
 
 import com.codahale.metrics.MetricRegistry;
+import com.navercorp.pinpoint.collector.grpc.channelz.ChannelzConfiguration;
 import com.navercorp.pinpoint.collector.grpc.config.GrpcAgentConfiguration;
 import com.navercorp.pinpoint.collector.grpc.config.GrpcAgentReceiverConfiguration;
 import com.navercorp.pinpoint.collector.grpc.config.GrpcComponentConfiguration;
@@ -49,7 +50,9 @@
         GrpcStatConfiguration.class,
         GrpcStatReceiverConfiguration.class,
 
-        GrpcKeepAliveScheduler.class
+        GrpcKeepAliveScheduler.class,
+
+        ChannelzConfiguration.class
 })
 @ComponentScan({
         "com.navercorp.pinpoint.collector.receiver.grpc"

diff --git a/...r/src/main/java/com/navercorp/pinpoint/collector/grpc/channelz/ChannelzConfiguration.java b/...r/src/main/java/com/navercorp/pinpoint/collector/grpc/channelz/ChannelzConfiguration.java
@@ -0,0 +1,19 @@
+package com.navercorp.pinpoint.collector.grpc.channelz;
+
+import com.navercorp.pinpoint.grpc.channelz.ChannelzRegistry;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan({
+        "com.navercorp.pinpoint.collector.grpc.channelz.service",
+        "com.navercorp.pinpoint.collector.grpc.channelz.controller"
+})
+public class ChannelzConfiguration {
+
+    @Bean
+    public ChannelzRegistry channelzRegistry() {
+        return new DefaultChannelzRegistry();
+    }
+}
diff --git a/...rpc/channelz/DefaultChannelzRegistry.java → ...rpc/channelz/DefaultChannelzRegistry.java b/...rpc/channelz/DefaultChannelzRegistry.java → ...rpc/channelz/DefaultChannelzRegistry.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.receiver.grpc.channelz;
+package com.navercorp.pinpoint.collector.grpc.channelz;
 
 import com.navercorp.pinpoint.grpc.channelz.ChannelzRegistry;
 import org.apache.logging.log4j.LogManager;

diff --git a/...lector/controller/ChannelzController.java → ...annelz/controller/ChannelzController.java b/...lector/controller/ChannelzController.java → ...annelz/controller/ChannelzController.java
@@ -1,10 +1,10 @@
-package com.navercorp.pinpoint.collector.controller;
+package com.navercorp.pinpoint.collector.grpc.channelz.controller;
 
-import com.navercorp.pinpoint.collector.service.ChannelzService;
-import com.navercorp.pinpoint.collector.service.ChannelzService.ServerStatsWithId;
-import com.navercorp.pinpoint.collector.service.ChannelzService.SocketStatsWithId;
-import com.navercorp.pinpoint.collector.service.ChannelzSocketLookup;
-import com.navercorp.pinpoint.collector.service.ChannelzSocketLookup.SocketEntry;
+import com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzService;
+import com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzService.ServerStatsWithId;
+import com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzService.SocketStatsWithId;
+import com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzSocketLookup;
+import com.navercorp.pinpoint.collector.grpc.channelz.util.HTMLBuilder;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -39,7 +39,7 @@ public List<SocketStatsWithId> findSocketStats(
             @RequestParam(required = false) Integer localPort
     ) {
         List<Long> ids = this.socketLookup.find(remoteAddress, localPort).stream()
-                .map(SocketEntry::getSocketId)
+                .map(ChannelzSocketLookup.SocketEntry::getSocketId)
                 .toList();
         return this.channelzService.getSocketStatsList(ids);
     }

diff --git a/...nt/collector/service/ChannelzService.java → ...rpc/channelz/service/ChannelzService.java b/...nt/collector/service/ChannelzService.java → ...rpc/channelz/service/ChannelzService.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.grpc.channelz.service;
 
 import io.grpc.InternalChannelz.ServerStats;
 import io.grpc.InternalChannelz.SocketStats;

diff --git a/...llector/service/ChannelzSocketLookup.java → ...hannelz/service/ChannelzSocketLookup.java b/...llector/service/ChannelzSocketLookup.java → ...hannelz/service/ChannelzSocketLookup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.grpc.channelz.service;
 
 import javax.annotation.Nullable;
 import java.util.Collection;

diff --git a/...ector/service/DefaultChannelzService.java → ...nnelz/service/DefaultChannelzService.java b/...ector/service/DefaultChannelzService.java → ...nnelz/service/DefaultChannelzService.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.grpc.channelz.service;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;

diff --git a/...service/InternalChannelzSocketLookup.java → ...service/InternalChannelzSocketLookup.java b/...service/InternalChannelzSocketLookup.java → ...service/InternalChannelzSocketLookup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.grpc.channelz.service;
 
 import com.google.common.base.Suppliers;
 import com.google.common.util.concurrent.ListenableFuture;

diff --git a/...int/collector/controller/HTMLBuilder.java → ...ector/grpc/channelz/util/HTMLBuilder.java b/...int/collector/controller/HTMLBuilder.java → ...ector/grpc/channelz/util/HTMLBuilder.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.collector.controller;
+package com.navercorp.pinpoint.collector.grpc.channelz.util;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

diff --git a/...rc/main/java/com/navercorp/pinpoint/collector/grpc/config/GrpcComponentConfiguration.java b/...rc/main/java/com/navercorp/pinpoint/collector/grpc/config/GrpcComponentConfiguration.java
@@ -16,13 +16,11 @@
 
 package com.navercorp.pinpoint.collector.grpc.config;
 
-import com.navercorp.pinpoint.collector.receiver.grpc.channelz.DefaultChannelzRegistry;
 import com.navercorp.pinpoint.collector.receiver.grpc.service.DefaultServerRequestFactory;
 import com.navercorp.pinpoint.collector.receiver.grpc.service.ServerRequestFactory;
 import com.navercorp.pinpoint.common.server.bo.filter.SpanEventFilter;
 import com.navercorp.pinpoint.common.server.bo.grpc.CollectorGrpcSpanFactory;
 import com.navercorp.pinpoint.common.server.bo.grpc.GrpcSpanBinder;
-import com.navercorp.pinpoint.grpc.channelz.ChannelzRegistry;
 import io.grpc.ServerTransportFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -49,11 +47,6 @@ public List<ServerTransportFilter> serverTransportFilterList() {
         return List.of();
     }
 
-    @Bean
-    public ChannelzRegistry channelzRegistry() {
-        return new DefaultChannelzRegistry();
-    }
-
 
     @Bean
     public CollectorGrpcSpanFactory collectorGrpcSpanFactory(SpanEventFilter spanEventFilter) {

diff --git a/...channelz/DefaultChannelzRegistryTest.java → ...channelz/DefaultChannelzRegistryTest.java b/...channelz/DefaultChannelzRegistryTest.java → ...channelz/DefaultChannelzRegistryTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.receiver.grpc.channelz;
+package com.navercorp.pinpoint.collector.grpc.channelz;
 
 import com.navercorp.pinpoint.grpc.channelz.ChannelzRegistry;
 import org.junit.jupiter.api.Test;

diff --git a/.../collector/service/ChannelzTestUtils.java → ...c/channelz/service/ChannelzTestUtils.java b/.../collector/service/ChannelzTestUtils.java → ...c/channelz/service/ChannelzTestUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.grpc.channelz.service;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import io.grpc.InternalChannelz.ServerStats;

diff --git a/...r/service/DefaultChannelzServiceTest.java → ...z/service/DefaultChannelzServiceTest.java b/...r/service/DefaultChannelzServiceTest.java → ...z/service/DefaultChannelzServiceTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.grpc.channelz.service;
 
-import com.navercorp.pinpoint.collector.service.ChannelzService.ServerStatsWithId;
-import com.navercorp.pinpoint.collector.service.ChannelzService.SocketStatsWithId;
-import com.navercorp.pinpoint.collector.service.ChannelzTestUtils.SimpleInternalInstrumented;
+import com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzService.ServerStatsWithId;
+import com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzService.SocketStatsWithId;
+import com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzTestUtils.SimpleInternalInstrumented;
 import com.navercorp.pinpoint.grpc.channelz.ChannelzRegistry;
 import io.grpc.InternalChannelz;
 import io.grpc.InternalChannelz.ServerStats;
@@ -32,8 +32,8 @@
 
 import java.util.List;
 
-import static com.navercorp.pinpoint.collector.service.ChannelzTestUtils.mockServerStats;
-import static com.navercorp.pinpoint.collector.service.ChannelzTestUtils.mockSocketStats;
+import static com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzTestUtils.mockServerStats;
+import static com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzTestUtils.mockSocketStats;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;

diff --git a/...r/service/InternalChannelzLookupTest.java → ...z/service/InternalChannelzLookupTest.java b/...r/service/InternalChannelzLookupTest.java → ...z/service/InternalChannelzLookupTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.collector.service;
+package com.navercorp.pinpoint.collector.grpc.channelz.service;
 
-import com.navercorp.pinpoint.collector.service.ChannelzSocketLookup.SocketEntry;
-import com.navercorp.pinpoint.collector.service.ChannelzTestUtils.SimpleInternalInstrumented;
+import com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzSocketLookup.SocketEntry;
+import com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzTestUtils.SimpleInternalInstrumented;
 import io.grpc.InternalChannelz;
 import io.grpc.InternalChannelz.ServerStats;
 import io.grpc.InternalChannelz.SocketStats;
@@ -29,8 +29,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import static com.navercorp.pinpoint.collector.service.ChannelzTestUtils.mockServerStats;
-import static com.navercorp.pinpoint.collector.service.ChannelzTestUtils.mockSocketStats;
+import static com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzTestUtils.mockServerStats;
+import static com.navercorp.pinpoint.collector.grpc.channelz.service.ChannelzTestUtils.mockSocketStats;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**