-
Notifications
You must be signed in to change notification settings - Fork 8k
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
Open
Daydreamer-ia
wants to merge
3
commits into
alibaba:1.8
Choose a base branch
from
Daydreamer-ia:1.8
base: 1.8
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/export/DefaultExporter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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("[DefaultExporter] Write metric error", e); | ||
} | ||
} | ||
} | ||
|
||
} |
37 changes: 37 additions & 0 deletions
37
sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/metric/export/MetricExporter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} |
38 changes: 38 additions & 0 deletions
38
sentinel-core/src/test/java/com/alibaba/csp/sentinel/node/metric/MetricExporterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} | ||
|
||
} |
33 changes: 33 additions & 0 deletions
33
sentinel-core/src/test/java/com/alibaba/csp/sentinel/node/metric/TestMetricExporter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) { | ||
|
||
} | ||
} |
17 changes: 17 additions & 0 deletions
17
...st/resources/META-INF/services/com.alibaba.csp.sentinel.node.metric.export.MetricExporter
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.