-
Notifications
You must be signed in to change notification settings - Fork 8.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feature: add metric exporter interface #3416
base: 1.8
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,16 +25,34 @@ | |
import com.alibaba.csp.sentinel.config.SentinelConfig; | ||
import com.alibaba.csp.sentinel.log.RecordLog; | ||
import com.alibaba.csp.sentinel.node.ClusterNode; | ||
import com.alibaba.csp.sentinel.node.metric.export.DefaultExporter; | ||
import com.alibaba.csp.sentinel.node.metric.export.MetricExporter; | ||
import com.alibaba.csp.sentinel.slotchain.ResourceWrapper; | ||
import com.alibaba.csp.sentinel.slots.clusterbuilder.ClusterBuilderSlot; | ||
import com.alibaba.csp.sentinel.spi.SpiLoader; | ||
|
||
/** | ||
* @author jialiang.linjl | ||
*/ | ||
public class MetricTimerListener implements Runnable { | ||
|
||
private static final MetricWriter metricWriter = new MetricWriter(SentinelConfig.singleMetricFileSize(), | ||
SentinelConfig.totalMetricFileCount()); | ||
private static MetricExporter exporter = null; | ||
|
||
static { | ||
MetricExporter instance = null; | ||
try { | ||
instance = SpiLoader.of(MetricExporter.class).loadFirstInstance(); | ||
} catch (Throwable t) { | ||
// ignore | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It would be better to log the exception using RecordLog. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
} | ||
if (instance == null) { | ||
MetricTimerListener.exporter = new DefaultExporter(); | ||
} else { | ||
MetricTimerListener.exporter = instance; | ||
} | ||
RecordLog.info("[MetricTimerListener] Active exporter: {}", MetricTimerListener.exporter.getClass()); | ||
} | ||
|
||
|
||
@Override | ||
public void run() { | ||
|
@@ -46,12 +64,10 @@ public void run() { | |
} | ||
aggregate(maps, Constants.ENTRY_NODE.metrics(), Constants.ENTRY_NODE); | ||
if (!maps.isEmpty()) { | ||
for (Entry<Long, List<MetricNode>> entry : maps.entrySet()) { | ||
try { | ||
metricWriter.write(entry.getKey(), entry.getValue()); | ||
} catch (Exception e) { | ||
RecordLog.warn("[MetricTimerListener] Write metric error", e); | ||
} | ||
try { | ||
exporter.export(maps); | ||
} catch (Exception e) { | ||
RecordLog.warn("[MetricTimerListener] Write metric error", e); | ||
} | ||
} | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* | ||
* Copyright 1999-2024 Alibaba Group Holding Ltd. | ||
* | ||
* 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.alibaba.csp.sentinel.node.metric.export; | ||
|
||
import com.alibaba.csp.sentinel.config.SentinelConfig; | ||
import com.alibaba.csp.sentinel.log.RecordLog; | ||
import com.alibaba.csp.sentinel.node.metric.MetricNode; | ||
import com.alibaba.csp.sentinel.node.metric.MetricWriter; | ||
|
||
import java.util.List; | ||
import java.util.Map; | ||
|
||
/** | ||
* Origin way to export metrics. | ||
* | ||
* @author Daydreamer-ia | ||
*/ | ||
public class DefaultExporter implements MetricExporter { | ||
|
||
private static final MetricWriter metricWriter = new MetricWriter(SentinelConfig.singleMetricFileSize(), | ||
SentinelConfig.totalMetricFileCount()); | ||
|
||
@Override | ||
public void export(Map<Long, List<MetricNode>> metrics) { | ||
for (Map.Entry<Long, List<MetricNode>> entry : metrics.entrySet()) { | ||
try { | ||
metricWriter.write(entry.getKey(), entry.getValue()); | ||
} catch (Exception e) { | ||
RecordLog.warn("[MetricTimerListener] Write metric error", e); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. MetricTimerListener -> DefaultExporter There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
} | ||
} | ||
} | ||
|
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
/* | ||
* Copyright 1999-2024 Alibaba Group Holding Ltd. | ||
* | ||
* 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.alibaba.csp.sentinel.node.metric.export; | ||
|
||
import com.alibaba.csp.sentinel.node.metric.MetricNode; | ||
|
||
import java.util.List; | ||
import java.util.Map; | ||
|
||
/** | ||
* Used to export metric. | ||
* | ||
* @author Daydreamer-ia | ||
*/ | ||
public interface MetricExporter { | ||
|
||
/** | ||
* export metrics. | ||
* | ||
* @param metrics metrics. | ||
*/ | ||
void export(Map<Long, List<MetricNode>> metrics); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* Copyright 1999-2024 Alibaba Group Holding Ltd. | ||
* | ||
* 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.alibaba.csp.sentinel.node.metric; | ||
|
||
import org.junit.Test; | ||
|
||
import java.lang.reflect.Field; | ||
|
||
import static org.junit.Assert.assertTrue; | ||
|
||
/** | ||
* @author Daydreamer-ia. | ||
*/ | ||
public class MetricExporterTest { | ||
|
||
@Test | ||
public void testExporter() throws NoSuchFieldException, IllegalAccessException { | ||
Field exporter = MetricTimerListener.class.getDeclaredField("exporter"); | ||
exporter.setAccessible(true); | ||
Object o = exporter.get(exporter); | ||
assertTrue(o instanceof TestMetricExporter); | ||
} | ||
|
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/* | ||
* Copyright 1999-2024 Alibaba Group Holding Ltd. | ||
* | ||
* 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.alibaba.csp.sentinel.node.metric; | ||
|
||
import com.alibaba.csp.sentinel.node.metric.export.MetricExporter; | ||
|
||
import java.util.List; | ||
import java.util.Map; | ||
|
||
/** | ||
* @author Daydreamer-ia | ||
*/ | ||
public class TestMetricExporter implements MetricExporter { | ||
|
||
@Override | ||
public void export(Map<Long, List<MetricNode>> metrics) { | ||
|
||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# | ||
# Copyright 1999-2024 Alibaba Group Holding Ltd. | ||
# | ||
# 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. | ||
# | ||
|
||
com.alibaba.csp.sentinel.node.metric.TestMetricExporter |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We may need to discuss whether it's more suitable to get the first implementation or to obtain a list to support multiple exporters.