Skip to content

feat(monitor): optimize http interface monitoring #5332

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Jul 5, 2023
Merged

feat(monitor): optimize http interface monitoring #5332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5c9ca49
feat(monitor): Optimize http interface monitoring
xxo1shine Jun 26, 2023
82ed309
Merge branch 'release_v4.7.2' of https://github.com/tronprotocol/java…
xxo1shine Jun 26, 2023
08cc798
Merge branch 'develop' of https://github.com/tronprotocol/java-tron i…
xxo1shine Jul 3, 2023
e1b9a0b
feat(monitor): remove unused filed
xxo1shine Jul 3, 2023
1a66522
feat(monitor): optimize http interface monitor
xxo1shine Jul 4, 2023
c43370a
feat(monitor): optimize monitoring logic for different http code
xxo1shine Jul 4, 2023
353587d
feat(monitor): optimize monitoring logic for http interface
xxo1shine Jul 4, 2023
e8a921f
feat(monitor): optimize code
xxo1shine Jul 4, 2023
757c15c
feat(monitor): modify monitoring key
xxo1shine Jul 4, 2023
929dfd9
Merge branch 'develop' of https://github.com/tronprotocol/java-tron i…
xxo1shine Jul 5, 2023
291d9fc
feat(unit): optimize AdvServiceTest
xxo1shine Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 30 additions & 46 deletions framework/src/main/java/org/tron/core/services/filter/HttpInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
public class HttpInterceptor implements Filter {

private String endpoint;
private final int HTTP_NOT_FOUND = 404;
private final int HTTP_SUCCESS = 200;
private final int HTTP_BAD_REQUEST = 400;
private final int HTTP_NOT_ACCEPTABLE = 406;

@Override
public void init(FilterConfig filterConfig) {
Expand All @@ -29,64 +30,47 @@ public void init(FilterConfig filterConfig) {
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) {
try {
if (request instanceof HttpServletRequest) {
endpoint = ((HttpServletRequest) request).getRequestURI();

CharResponseWrapper responseWrapper = new CharResponseWrapper(
(HttpServletResponse) response);
chain.doFilter(request, responseWrapper);

HttpServletResponse resp = (HttpServletResponse) response;

if (resp.getStatus() != HTTP_NOT_FOUND) { // correct endpoint
String endpointQPS = MetricsKey.NET_API_DETAIL_QPS + endpoint;
MetricsUtil.meterMark(MetricsKey.NET_API_QPS);
MetricsUtil.meterMark(endpointQPS);

int reposeContentSize = responseWrapper.getByteSize();
String endpointOutTraffic = MetricsKey.NET_API_DETAIL_OUT_TRAFFIC + endpoint;
MetricsUtil.meterMark(MetricsKey.NET_API_OUT_TRAFFIC,
reposeContentSize);
MetricsUtil.meterMark(endpointOutTraffic, reposeContentSize);

if (resp.getStatus() != HTTP_SUCCESS) { //http fail
String endpointFailQPS = MetricsKey.NET_API_DETAIL_FAIL_QPS + endpoint;
MetricsUtil.meterMark(MetricsKey.NET_API_FAIL_QPS);
MetricsUtil.meterMark(endpointFailQPS);
}
} else { // wrong endpoint
MetricsUtil.meterMark(MetricsKey.NET_API_QPS);
MetricsUtil.meterMark(MetricsKey.NET_API_FAIL_QPS);
}
if (!(request instanceof HttpServletRequest)) {
chain.doFilter(request, response);
return;
}
endpoint = ((HttpServletRequest) request).getRequestURI();
CharResponseWrapper responseWrapper = new CharResponseWrapper(
(HttpServletResponse) response);
chain.doFilter(request, responseWrapper);
HttpServletResponse resp = (HttpServletResponse) response;
int size = responseWrapper.getByteSize();
MetricsUtil.meterMark(MetricsKey.NET_API_OUT_TRAFFIC, size);
MetricsUtil.meterMark(MetricsKey.NET_API_QPS);
if (resp.getStatus() >= HTTP_BAD_REQUEST && resp.getStatus() <= HTTP_NOT_ACCEPTABLE) {
MetricsUtil.meterMark(MetricsKey.NET_API_FAIL_QPS);
Metrics.histogramObserve(MetricKeys.Histogram.HTTP_BYTES,
responseWrapper.getByteSize(),
Strings.isNullOrEmpty(endpoint) ? MetricLabels.UNDEFINED : endpoint,
String.valueOf(responseWrapper.getStatus()));
size, MetricLabels.UNDEFINED, String.valueOf(responseWrapper.getStatus()));
return;
}
if (resp.getStatus() == HTTP_SUCCESS) {
MetricsUtil.meterMark(MetricsKey.NET_API_DETAIL_QPS + endpoint);
} else {
chain.doFilter(request, response);
MetricsUtil.meterMark(MetricsKey.NET_API_FAIL_QPS);
MetricsUtil.meterMark(MetricsKey.NET_API_DETAIL_FAIL_QPS + endpoint);
}

MetricsUtil.meterMark(MetricsKey.NET_API_DETAIL_OUT_TRAFFIC + endpoint, size);
Metrics.histogramObserve(MetricKeys.Histogram.HTTP_BYTES,
size, endpoint, String.valueOf(responseWrapper.getStatus()));
} catch (Exception e) {

if (MetricsUtil.getMeters(MetricsKey.NET_API_DETAIL_QPS).containsKey(
MetricsKey.NET_API_DETAIL_QPS + endpoint)) { // correct endpoint
MetricsUtil.meterMark(MetricsKey.NET_API_DETAIL_FAIL_QPS
+ endpoint, 1);
MetricsUtil.meterMark(MetricsKey.NET_API_DETAIL_QPS
+ endpoint, 1);
String key = MetricsKey.NET_API_DETAIL_QPS + endpoint;
if (MetricsUtil.getMeters(MetricsKey.NET_API_DETAIL_QPS).containsKey(key)) {
MetricsUtil.meterMark(key, 1);
MetricsUtil.meterMark(MetricsKey.NET_API_DETAIL_FAIL_QPS + endpoint, 1);
}
MetricsUtil.meterMark(MetricsKey.NET_API_QPS, 1);
MetricsUtil.meterMark(MetricsKey.NET_API_FAIL_QPS, 1);

}

}

@Override
public void destroy() {

}

}


Expand Down
81 changes: 49 additions & 32 deletions framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,58 @@
package org.tron.core.net.services;

import com.google.common.collect.Lists;
import java.util.List;
import javax.annotation.Resource;
import static org.mockito.Mockito.mock;

import java.io.File;
import java.net.InetSocketAddress;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.tron.common.BaseTest;
import org.mockito.Mockito;
import org.springframework.context.ApplicationContext;
import org.tron.common.application.TronApplicationContext;
import org.tron.common.parameter.CommonParameter;
import org.tron.common.utils.FileUtil;
import org.tron.common.utils.ReflectUtils;
import org.tron.common.utils.Sha256Hash;
import org.tron.core.Constant;
import org.tron.core.capsule.BlockCapsule;
import org.tron.core.config.DefaultConfig;
import org.tron.core.config.args.Args;
import org.tron.core.net.P2pEventHandlerImpl;
import org.tron.core.net.message.adv.BlockMessage;
import org.tron.core.net.message.adv.TransactionMessage;
import org.tron.core.net.peer.Item;
import org.tron.core.net.peer.PeerConnection;
import org.tron.core.net.peer.PeerManager;
import org.tron.core.net.service.adv.AdvService;
import org.tron.p2p.P2pEventHandler;
import org.tron.p2p.connection.Channel;
import org.tron.protos.Protocol;
import org.tron.protos.Protocol.Inventory.InventoryType;

public class AdvServiceTest extends BaseTest {

@Resource
private AdvService service;
@Resource
private PeerConnection peer;
public class AdvServiceTest {
private static String dbPath = "output-adv-service-test1";
private static TronApplicationContext context;
private static AdvService service;
private static P2pEventHandlerImpl p2pEventHandler;
private static ApplicationContext ctx;

/**
* init context.
*/
@BeforeClass
public static void init() {
dbPath = "output-adv-service-test";
Args.setParam(new String[]{"--output-directory", dbPath, "--debug"},
Constant.TEST_CONF);
Constant.TEST_CONF);
context = new TronApplicationContext(DefaultConfig.class);
service = context.getBean(AdvService.class);
p2pEventHandler = context.getBean(P2pEventHandlerImpl.class);
ctx = (ApplicationContext) ReflectUtils.getFieldObject(p2pEventHandler, "ctx");
}

@AfterClass
public static void after() {
Args.clearParam();
context.destroy();
FileUtil.deleteDir(new File(dbPath));
}

@Test
Expand Down Expand Up @@ -66,25 +82,26 @@ private void testAddInv() {
}

private void testBroadcast() {
InetSocketAddress inetSocketAddress =
new InetSocketAddress("127.0.0.2", 10001);

try {
List<PeerConnection> peers = Lists.newArrayList();
peers.add(peer);
ReflectUtils.setFieldValue(P2pEventHandler.class, "peers", peers);
BlockCapsule blockCapsule = new BlockCapsule(1, Sha256Hash.ZERO_HASH,
System.currentTimeMillis(), Sha256Hash.ZERO_HASH.getByteString());
BlockMessage msg = new BlockMessage(blockCapsule);
service.broadcast(msg);
Item item = new Item(blockCapsule.getBlockId(), InventoryType.BLOCK);
Assert.assertNotNull(service.getMessage(item));
peer.checkAndPutAdvInvRequest(item, System.currentTimeMillis());
boolean res = peer.checkAndPutAdvInvRequest(item, System.currentTimeMillis());
Assert.assertFalse(res);
} catch (NullPointerException e) {
System.out.println(e);
}
}
Channel c1 = mock(Channel.class);
Mockito.when(c1.getInetSocketAddress()).thenReturn(inetSocketAddress);
Mockito.when(c1.getInetAddress()).thenReturn(inetSocketAddress.getAddress());

PeerConnection peer = PeerManager.add(ctx, c1);
peer.setChannel(c1);
peer.setNeedSyncFromUs(false);
peer.setNeedSyncFromPeer(false);

BlockCapsule blockCapsule = new BlockCapsule(1, Sha256Hash.ZERO_HASH,
System.currentTimeMillis(), Sha256Hash.ZERO_HASH.getByteString());
BlockMessage msg = new BlockMessage(blockCapsule);
service.broadcast(msg);
Item item = new Item(blockCapsule.getBlockId(), InventoryType.BLOCK);
Assert.assertNotNull(service.getMessage(item));
Assert.assertNotNull(peer.getAdvInvSpread().getIfPresent(item));
}

private void testTrxBroadcast() {
Protocol.Transaction trx = Protocol.Transaction.newBuilder().build();
Expand Down