[GitHub] wujimin commented on a change in pull request #639: [SCB-422] prometheus switch to new mechanism
wujimin commented on a change in pull request #639: [SCB-422] prometheus switch
to new mechanism
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/639#discussion_r180006147
##
File path:
metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java
##
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.servicecomb.metrics.prometheus;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
+import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import com.netflix.spectator.api.CompositeRegistry;
+import com.netflix.spectator.api.Counter;
+import com.netflix.spectator.api.DefaultRegistry;
+import com.netflix.spectator.api.ManualClock;
+import com.netflix.spectator.api.Registry;
+import com.netflix.spectator.api.SpectatorUtils;
+import com.sun.net.httpserver.HttpServer;
+
+import io.prometheus.client.exporter.HTTPServer;
+
+@SuppressWarnings("restriction")
+public class TestPrometheusPublisher {
+ CompositeRegistry globalRegistry =
SpectatorUtils.createCompositeRegistry(new ManualClock());
+
+ PrometheusPublisher publisher = new PrometheusPublisher();
+
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ @AfterClass
+ public static void teardown() {
+ArchaiusUtils.resetConfig();
+ }
+
+ @Test
+ public void testBadPublishAddress() {
+thrown.expect(ServiceCombException.class);
+
+ArchaiusUtils.setProperty(PrometheusPublisher.METRICS_PROMETHEUS_ADDRESS,
"a:b:c");
+publisher.init(globalRegistry, null, null);
+ }
+
+ @Test
+ public void testBadPublishAddress_BadPort() {
+thrown.expect(ServiceCombException.class);
+
+ArchaiusUtils.setProperty(PrometheusPublisher.METRICS_PROMETHEUS_ADDRESS,
"localhost:");
+publisher.init(globalRegistry, null, null);
+ }
+
+ @Test
+ public void testBadPublishAddress_TooLargePort() {
+thrown.expect(ServiceCombException.class);
+
+ArchaiusUtils.setProperty(PrometheusPublisher.METRICS_PROMETHEUS_ADDRESS,
"localhost:999");
+publisher.init(globalRegistry, null, null);
+ }
+
+ @Test
+ public void collect() throws IllegalAccessException, IOException {
+ArchaiusUtils.setProperty(PrometheusPublisher.METRICS_PROMETHEUS_ADDRESS,
"localhost:0");
+publisher.init(globalRegistry, null, null);
+
+Registry registry = new DefaultRegistry(new ManualClock());
+globalRegistry.add(registry);
+
+Counter counter = registry.counter("count.name", "tag1", "tag1v", "tag2",
"tag2v");
+counter.increment();
+
+HTTPServer httpServer = (HTTPServer) FieldUtils.readField(publisher,
"httpServer", true);
Review comment:
we can use port 0 to try listen, and got the real port, and then close it
use the found real port to init prometheus.
but so complex, no need to do this, just a test case. i think reflection is
enough.
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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
With regards,
Apache Git Services
[GitHub] wujimin commented on a change in pull request #639: [SCB-422] prometheus switch to new mechanism
wujimin commented on a change in pull request #639: [SCB-422] prometheus switch
to new mechanism
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/639#discussion_r180006147
##
File path:
metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java
##
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.servicecomb.metrics.prometheus;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
+import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import com.netflix.spectator.api.CompositeRegistry;
+import com.netflix.spectator.api.Counter;
+import com.netflix.spectator.api.DefaultRegistry;
+import com.netflix.spectator.api.ManualClock;
+import com.netflix.spectator.api.Registry;
+import com.netflix.spectator.api.SpectatorUtils;
+import com.sun.net.httpserver.HttpServer;
+
+import io.prometheus.client.exporter.HTTPServer;
+
+@SuppressWarnings("restriction")
+public class TestPrometheusPublisher {
+ CompositeRegistry globalRegistry =
SpectatorUtils.createCompositeRegistry(new ManualClock());
+
+ PrometheusPublisher publisher = new PrometheusPublisher();
+
+ @Rule
+ public ExpectedException thrown = ExpectedException.none();
+
+ @AfterClass
+ public static void teardown() {
+ArchaiusUtils.resetConfig();
+ }
+
+ @Test
+ public void testBadPublishAddress() {
+thrown.expect(ServiceCombException.class);
+
+ArchaiusUtils.setProperty(PrometheusPublisher.METRICS_PROMETHEUS_ADDRESS,
"a:b:c");
+publisher.init(globalRegistry, null, null);
+ }
+
+ @Test
+ public void testBadPublishAddress_BadPort() {
+thrown.expect(ServiceCombException.class);
+
+ArchaiusUtils.setProperty(PrometheusPublisher.METRICS_PROMETHEUS_ADDRESS,
"localhost:");
+publisher.init(globalRegistry, null, null);
+ }
+
+ @Test
+ public void testBadPublishAddress_TooLargePort() {
+thrown.expect(ServiceCombException.class);
+
+ArchaiusUtils.setProperty(PrometheusPublisher.METRICS_PROMETHEUS_ADDRESS,
"localhost:999");
+publisher.init(globalRegistry, null, null);
+ }
+
+ @Test
+ public void collect() throws IllegalAccessException, IOException {
+ArchaiusUtils.setProperty(PrometheusPublisher.METRICS_PROMETHEUS_ADDRESS,
"localhost:0");
+publisher.init(globalRegistry, null, null);
+
+Registry registry = new DefaultRegistry(new ManualClock());
+globalRegistry.add(registry);
+
+Counter counter = registry.counter("count.name", "tag1", "tag1v", "tag2",
"tag2v");
+counter.increment();
+
+HTTPServer httpServer = (HTTPServer) FieldUtils.readField(publisher,
"httpServer", true);
Review comment:
we can use port 0 to try listen, and got the real port, and the close it
use the found real port to init prometheus.
but so complex, no need to do this, just a test case. i think reflection is
enough.
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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
With regards,
Apache Git Services
[GitHub] wujimin commented on a change in pull request #639: [SCB-422] prometheus switch to new mechanism
wujimin commented on a change in pull request #639: [SCB-422] prometheus switch to new mechanism URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/639#discussion_r180005756 ## File path: metrics/metrics-integration/metrics-prometheus/pom.xml ## @@ -43,7 +42,10 @@ org.apache.servicecomb metrics-core - + Review comment: 'foundation-test-scaffolding' already in 'test' scope, no need to set again. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] wujimin commented on a change in pull request #639: [SCB-422] prometheus switch to new mechanism
wujimin commented on a change in pull request #639: [SCB-422] prometheus switch to new mechanism URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/639#discussion_r180005837 ## File path: metrics/metrics-integration/metrics-prometheus/src/test/java/org/apache/servicecomb/metrics/prometheus/TestPrometheusPublisher.java ## @@ -0,0 +1,107 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.servicecomb.metrics.prometheus; + +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.URL; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException; +import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import com.netflix.spectator.api.CompositeRegistry; +import com.netflix.spectator.api.Counter; +import com.netflix.spectator.api.DefaultRegistry; +import com.netflix.spectator.api.ManualClock; +import com.netflix.spectator.api.Registry; +import com.netflix.spectator.api.SpectatorUtils; +import com.sun.net.httpserver.HttpServer; Review comment: prometheus depend on com.sun.net.httpserver.HttpServer This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] wujimin commented on a change in pull request #639: [SCB-422] prometheus switch to new mechanism
wujimin commented on a change in pull request #639: [SCB-422] prometheus switch
to new mechanism
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/639#discussion_r179985745
##
File path:
metrics/metrics-integration/metrics-prometheus/src/main/java/org/apache/servicecomb/metrics/prometheus/PrometheusPublisher.java
##
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.servicecomb.metrics.prometheus;
+
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
+import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
+import org.apache.servicecomb.foundation.metrics.MetricsInitializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.eventbus.EventBus;
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.spectator.api.CompositeRegistry;
+import com.netflix.spectator.api.Measurement;
+import com.netflix.spectator.api.Tag;
+
+import io.prometheus.client.Collector;
+import io.prometheus.client.Collector.MetricFamilySamples.Sample;
+import io.prometheus.client.CollectorRegistry;
+import io.prometheus.client.exporter.HTTPServer;
+
+public class PrometheusPublisher extends Collector implements
Collector.Describable, MetricsInitializer {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(PrometheusPublisher.class);
+
+ static final String METRICS_PROMETHEUS_ADDRESS =
"servicecomb.metrics.prometheus.address";
+
+ private HTTPServer httpServer;
+
+ private CompositeRegistry globalRegistry;
+
+ @Override
+ public void init(CompositeRegistry globalRegistry, EventBus eventBus,
MetricsBootstrapConfig config) {
+this.globalRegistry = globalRegistry;
+
+//prometheus default port allocation is here :
https://github.com/prometheus/prometheus/wiki/Default-port-allocations
+String address =
+
DynamicPropertyFactory.getInstance().getStringProperty(METRICS_PROMETHEUS_ADDRESS,
"0.0.0.0:9696").get();
+
+try {
+ InetSocketAddress socketAddress = getSocketAddress(address);
+ register();
+ this.httpServer = new HTTPServer(socketAddress,
CollectorRegistry.defaultRegistry, true);
Review comment:
By MetricsRestPublisher in previous PR, we already support metrics endpoint:
/metrics
and created a issue for contribute:
https://issues.apache.org/jira/browse/SCB-466
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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
With regards,
Apache Git Services
