[#10882] Add server map module based on redis-timeseries

collector/pom.xml

@@ -222,6 +222,12 @@
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-redis-timeseries</artifactId>
+            <version>3.1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

collector/src/main/java/com/navercorp/pinpoint/collector/PinpointCollectorModule.java

@@ -1,6 +1,7 @@
 package com.navercorp.pinpoint.collector;
 
 
+import com.navercorp.pinpoint.collector.applicationmap.ApplicationMapModule;
 import com.navercorp.pinpoint.collector.config.ClusterModule;
 import com.navercorp.pinpoint.collector.config.CollectorCommonConfiguration;
 import com.navercorp.pinpoint.collector.config.CollectorConfiguration;
@@ -38,6 +39,7 @@
         RealtimeCollectorModule.class,
 
         CollectorPinpointIdConfiguration.class,
+        ApplicationMapModule.class,
 })
 @ComponentScan(basePackages = {
         "com.navercorp.pinpoint.collector.handler",

collector/src/main/java/com/navercorp/pinpoint/collector/applicationmap/ApplicationMapModule.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.navercorp.pinpoint.collector.applicationmap;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author intr3p1d
+ */
+@Configuration(proxyBeanMethods = false)
+@ComponentScan(basePackages = {
+        "com.navercorp.pinpoint.collector.applicationmap",
+        "com.navercorp.pinpoint.collector.applicationmap.dao",
+        "com.navercorp.pinpoint.collector.applicationmap.redis",
+        "com.navercorp.pinpoint.collector.applicationmap.service",
+})
+public class ApplicationMapModule {
+}

collector/src/main/java/com/navercorp/pinpoint/collector/applicationmap/dao/InboundDao.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.navercorp.pinpoint.collector.applicationmap.dao;
+
+import com.navercorp.pinpoint.collector.dao.CachedStatisticsDao;
+import com.navercorp.pinpoint.common.trace.ServiceType;
+
+/**
+ * @author intr3p1d
+ */
+public interface InboundDao extends CachedStatisticsDao {
+    // src -> dest
+    // inbound (rowKey dest <- columnName src)
+    // outbound (rowKey src -> columnName dest)
+    void update(
+            long requestTime,
+            int srcServiceId, String srcApplicationName, ServiceType srcApplicationType,
+            int destServiceId, String destApplicationName, ServiceType destApplicationType,
+            String srcHost, int elapsed, boolean isError
+    );
+}

collector/src/main/java/com/navercorp/pinpoint/collector/applicationmap/dao/OutboundDao.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.navercorp.pinpoint.collector.applicationmap.dao;
+
+import com.navercorp.pinpoint.collector.dao.CachedStatisticsDao;
+import com.navercorp.pinpoint.common.trace.ServiceType;
+
+/**
+ * @author intr3p1d
+ */
+public interface OutboundDao extends CachedStatisticsDao {
+    // src -> dest
+    // inbound (rowKey dest <- columnName src)
+    // outbound (rowKey src -> columnName dest)
+    void update(
+            long requestTime,
+            int srcServiceId, String srcApplicationName, ServiceType srcApplicationType,
+            int destServiceId, String destApplicationName, ServiceType destApplicationType,
+            String srcHost, int elapsed, boolean isError
+    );
+}

collector/src/main/java/com/navercorp/pinpoint/collector/applicationmap/dao/SelfDao.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.navercorp.pinpoint.collector.applicationmap.dao;
+
+
+import com.navercorp.pinpoint.collector.dao.CachedStatisticsDao;
+import com.navercorp.pinpoint.common.trace.ServiceType;
+
+/**
+ * @author intr3p1d
+ */
+public interface SelfDao extends CachedStatisticsDao {
+    void received(long requestTime, int serviceId, String applicationName, ServiceType applicationType, int elapsed, boolean isError);
+    void updatePing(long requestTime, int serviceId, String applicationName, ServiceType applicationType, int elapsed, boolean isError);
+}

collector/src/main/java/com/navercorp/pinpoint/collector/applicationmap/redis/RedisInboundDao.java

@@ -0,0 +1,130 @@
+/*
+ * Copyright 2024 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.navercorp.pinpoint.collector.applicationmap.redis;
+
+import com.navercorp.pinpoint.collector.applicationmap.dao.InboundDao;
+import com.navercorp.pinpoint.collector.applicationmap.redis.schema.ApplicationMapTable;
+import com.navercorp.pinpoint.collector.applicationmap.redis.schema.TimeSeriesKey;
+import com.navercorp.pinpoint.collector.applicationmap.redis.schema.TimeSeriesValue;
+import com.navercorp.pinpoint.collector.dao.hbase.IgnoreStatFilter;
+import com.navercorp.pinpoint.collector.dao.hbase.statistics.MapLinkConfiguration;
+import com.navercorp.pinpoint.collector.applicationmap.redis.statistics.RedisBulkWriter;
+import com.navercorp.pinpoint.common.server.util.ApplicationMapStatisticsUtils;
+import com.navercorp.pinpoint.common.trace.HistogramSchema;
+import com.navercorp.pinpoint.common.trace.ServiceType;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+import java.util.Objects;
+
+/**
+ * @author intr3p1d
+ */
+@Repository
+public class RedisInboundDao implements InboundDao {
+
+    private final Logger logger = LogManager.getLogger(this.getClass());
+
+    private final IgnoreStatFilter ignoreStatFilter;
+    private final RedisBulkWriter bulkWriter;
+    private final MapLinkConfiguration mapLinkConfiguration;
+
+    public RedisInboundDao(
+            MapLinkConfiguration mapLinkConfiguration,
+            IgnoreStatFilter ignoreStatFilter,
+            @Qualifier("inboundBulkWriter") RedisBulkWriter bulkWriter
+    ) {
+        this.mapLinkConfiguration = Objects.requireNonNull(mapLinkConfiguration, "mapLinkConfiguration");
+        this.ignoreStatFilter = Objects.requireNonNull(ignoreStatFilter, "ignoreStatFilter");
+        this.bulkWriter = Objects.requireNonNull(bulkWriter, "inboundBulkWriter");
+    }
+
+
+    @Override
+    public void update(
+            long requestTime,
+            int srcServiceId, String srcApplicationName, ServiceType srcApplicationType,
+            int destServiceId, String destApplicationName, ServiceType destApplicationType,
+            String srcHost, int elapsed, boolean isError
+    ) {
+        Objects.requireNonNull(srcApplicationName, "srcApplicationName");
+        Objects.requireNonNull(destApplicationName, "destApplicationName");
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("[Inbound] {} {}({}) <- {} {}({})[{}]",
+                    destServiceId, destApplicationName, destApplicationType,
+                    srcServiceId, srcApplicationName, srcApplicationType, srcHost
+            );
+        }
+
+        if (ignoreStatFilter.filter(srcApplicationType, srcHost)) {
+            logger.debug("[Ignore-Inbound] {} {}({}) <- {} {}({})[{}]",
+                    destServiceId, destApplicationName, destApplicationType,
+                    srcServiceId, srcApplicationName, srcApplicationType, srcHost
+            );
+            return;
+        }
+
+        final short srcSlotNumber = ApplicationMapStatisticsUtils.getSlotNumber(srcApplicationType, elapsed, isError);
+        HistogramSchema histogramSchema = srcApplicationType.getHistogramSchema();
+
+        // for inbound, main is destination
+        // and sub is source
+        final TimeSeriesKey applicationTypeKey = new TimeSeriesKey(
+                ApplicationMapTable.Inbound, "tenantId",
+                destServiceId, destApplicationName, destApplicationType.getCode(),
+                srcServiceId, srcApplicationName, srcApplicationType.getCode(),
+                srcSlotNumber
+        );
+        TimeSeriesValue addOne = new TimeSeriesValue(requestTime);
+        this.bulkWriter.increment(applicationTypeKey, addOne);
+
+        if (mapLinkConfiguration.isEnableAvg()) {
+            final TimeSeriesKey sumStatKey = new TimeSeriesKey(
+                    ApplicationMapTable.Inbound, "tenantId",
+                    destServiceId, destApplicationName, destApplicationType.getCode(),
+                    srcServiceId, srcApplicationName, srcApplicationType.getCode(),
+                    histogramSchema.getSumStatSlot().getSlotTime()
+            );
+            final TimeSeriesValue sumValue = new TimeSeriesValue(requestTime);
+            this.bulkWriter.increment(sumStatKey, sumValue, elapsed);
+        }
+        if (mapLinkConfiguration.isEnableMax()) {
+            final TimeSeriesKey maxStatKey = new TimeSeriesKey(
+                    ApplicationMapTable.Inbound, "tenantId",
+                    destServiceId, destApplicationName, destApplicationType.getCode(),
+                    srcServiceId, srcApplicationName, srcApplicationType.getCode(),
+                    histogramSchema.getMaxStatSlot().getSlotTime()
+            );
+            final TimeSeriesValue maxValue = new TimeSeriesValue(requestTime);
+            this.bulkWriter.updateMax(maxStatKey, maxValue, elapsed);
+        }
+
+    }
+
+    @Override
+    public void flushLink() {
+        this.bulkWriter.flushLink();
+    }
+
+    @Override
+    public void flushAvgMax() {
+        this.bulkWriter.flushAvgMax();
+    }
+
+}