Skip to content

#1109 Make queue size of MetricJsonListener configurable #1114

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 3 commits into from
Mar 11, 2016
Merged

#1109 Make queue size of MetricJsonListener configurable #1114

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a88b30b
#1109 MetricJsonListener queue size can be configured by passing addi…
Feb 29, 2016
1410bee
#1109 Make default metric listener queue size configurable by propert…
Mar 2, 2016
ee6c90a
#1109 Rolling back request parameter support for setting queueSize
Mar 11, 2016
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
Prev Previous commit
#1109 Rolling back request parameter support for setting queueSize
  • Loading branch information
awazalwar committed Mar 11, 2016
commit ee6c90ac937f5e8a27fa17fdfb78cf333ad983cd
28 changes: 9 additions & 19 deletions ...ain/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,20 @@
*/
package com.netflix.hystrix.contrib.metrics.eventstream;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
import com.netflix.config.DynamicIntProperty;
import com.netflix.config.DynamicPropertyFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.netflix.config.DynamicIntProperty;
import com.netflix.config.DynamicPropertyFactory;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;

/**
* Streams Hystrix metrics in text/event-stream format.
Expand Down Expand Up @@ -137,14 +135,6 @@ private void handleRequest(HttpServletRequest request, HttpServletResponse respo
response.setHeader("Pragma", "no-cache");

int queueSize = defaultMetricListenerQueueSize.get();
try {
String q = request.getParameter("queueSize");
if (q != null) {
queueSize = Integer.parseInt(q);
}
} catch (Exception e) {
// ignore if it's not a number
}

MetricJsonListener jsonListener = new MetricJsonListener(queueSize);
poller = new HystrixMetricsPoller(jsonListener, delay);
Expand Down