[GitHub] [skywalking] wu-sheng commented on a change in pull request #6602: Enhance the export service.

[GitBox]

wu-sheng commented on a change in pull request #6602:
URL: https://github.com/apache/skywalking/pull/6602#discussion_r599524644



##########
File path: 
oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
##########
@@ -67,27 +67,46 @@ public GRPCExporter(GRPCExporterSetting setting) {
         blockingStub = MetricExportServiceGrpc.newBlockingStub(channel);
         exportBuffer = new 
DataCarrier<ExportData>(setting.getBufferChannelNum(), 
setting.getBufferChannelSize());
         exportBuffer.consume(this, 1, 200);
-        subscriptionSet = new HashSet<>();
+        subscriptionList = new ArrayList<>();
     }
 
     @Override
     public void export(ExportEvent event) {
-        if (ExportEvent.EventType.TOTAL == event.getType()) {
-            Metrics metrics = event.getMetrics();
-            if (metrics instanceof WithMetadata) {
-                MetricsMetaInfo meta = ((WithMetadata) metrics).getMeta();
-                if (subscriptionSet.size() == 0 || 
subscriptionSet.contains(meta.getMetricsName())) {
-                    exportBuffer.produce(new ExportData(meta, metrics));
-                }
+        Metrics metrics = event.getMetrics();
+        if (metrics instanceof WithMetadata) {
+            MetricsMetaInfo meta = ((WithMetadata) metrics).getMeta();
+            if (subscriptionList.size() == 0 && 
ExportEvent.EventType.INCREMENT.equals(event.getType())) {
+                exportBuffer.produce(new ExportData(meta, metrics, 
event.getType()));
+            } else {
+                subscriptionList.forEach(subscriptionMetric -> {
+                    if 
(subscriptionMetric.getMetricName().equals(meta.getMetricsName()) &&
+                        eventTypeMatch(event.getType(), 
subscriptionMetric.getEventType())) {
+                        exportBuffer.produce(new ExportData(meta, metrics, 
event.getType()));
+                    }
+                });
             }
+
+            fetchSubscriptionList();
         }
     }
 
-    public void initSubscriptionList() {
-        SubscriptionsResp subscription = blockingStub.withDeadlineAfter(10, 
TimeUnit.SECONDS)
-                                                     
.subscription(SubscriptionReq.newBuilder().build());
-        subscription.getMetricNamesList().forEach(subscriptionSet::add);
-        LOGGER.debug("Get exporter subscription list, {}", subscriptionSet);
+    /**
+     * Read the subscription list.
+     */
+    public void fetchSubscriptionList() {
+        final long currentTimeMillis = System.currentTimeMillis();
+        if (currentTimeMillis - lastFetchTimestamp > 30_000) {
+            try {
+                lastFetchTimestamp = currentTimeMillis;
+                SubscriptionsResp subscription = 
blockingStub.withDeadlineAfter(10, TimeUnit.SECONDS)
+                                                             
.subscription(SubscriptionReq.newBuilder().build());
+                subscriptionList.clear();
+                subscriptionList.addAll(subscription.getMetricsList());

Review comment:
       I pushed another version. Muse-dev detected the right one.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org