Skip to content

Commit 174e487

Browse files
zeitlingerzeitlinger
committed
lint
Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent b0c21d0 commit 174e487

File tree

5 files changed

+88
-83
lines changed

5 files changed

+88
-83
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Prometheus Java Metrics Library
22

3-
[![Build](https://github.com/prometheus/client_java/actions/workflows/build.yml/badge.svg)](https://github.com/prometheus/client_java/actions/workflows/build.yml) <a href="#"><img src="https://img.shields.io/badge/JDK%20compatibility-8+-blue.svg" alt="java 8+"></a> <a href="#"><img src="https://img.shields.io/badge/license-Apache%202.0-blue.svg" alt="Apache 2.0"></a>
3+
[![Build](https://github.com/prometheus/client_java/actions/workflows/build.yml/badge.svg)](https://github.com/prometheus/client_java/actions/workflows/build.yml) <a href="#"><img src="https://img.shields.io/badge/JDK%20compatibility-8+-blue.svg" alt="java 8+"></a> <a href="#"><img src="https://img.shields.io/badge/license-Apache%202.0-blue.svg" alt="Apache 2.0"></a> # editorconfig-checker-disable-line
44

55
## Documentation
66

‎prometheus-metrics-instrumentation-jvm/pom.xml‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
45

5-
<parent>
6-
<groupId>io.prometheus</groupId>
7-
<artifactId>client_java</artifactId>
8-
<version>1.4.0-SNAPSHOT</version>
9-
</parent>
6+
<parent>
7+
<groupId>io.prometheus</groupId>
8+
<artifactId>client_java</artifactId>
9+
<version>1.4.0-SNAPSHOT</version>
10+
</parent>
1011

11-
<artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
12-
<packaging>bundle</packaging>
12+
<artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
13+
<packaging>bundle</packaging>
1314

14-
<name>Prometheus Metrics Instrumentation - JVM</name>
15-
<description>
16-
Instrumentation library for JVM metrics
17-
</description>
15+
<name>Prometheus Metrics Instrumentation - JVM</name>
16+
<description>
17+
Instrumentation library for JVM metrics
18+
</description>
1819

19-
<properties>
20-
<automatic.module.name>io.prometheus.metrics.instrumentation.jvm</automatic.module.name>
21-
<jacoco.line-coverage>0.55</jacoco.line-coverage>
22-
</properties>
20+
<properties>
21+
<automatic.module.name>io.prometheus.metrics.instrumentation.jvm</automatic.module.name>
22+
<jacoco.line-coverage>0.55</jacoco.line-coverage>
23+
</properties>
2324

24-
<dependencies>
25-
<dependency>
26-
<groupId>io.prometheus</groupId>
27-
<artifactId>prometheus-metrics-core</artifactId>
28-
<version>${project.version}</version>
29-
</dependency>
25+
<dependencies>
26+
<dependency>
27+
<groupId>io.prometheus</groupId>
28+
<artifactId>prometheus-metrics-core</artifactId>
29+
<version>${project.version}</version>
30+
</dependency>
3031

31-
<!-- test dependencies -->
32-
<dependency>
33-
<groupId>io.prometheus</groupId>
34-
<artifactId>prometheus-metrics-exporter-httpserver</artifactId>
35-
<version>${project.version}</version>
36-
<scope>test</scope>
37-
</dependency>
38-
<dependency>
39-
<groupId>io.prometheus</groupId>
40-
<artifactId>prometheus-metrics-exposition-textformats</artifactId>
41-
<version>${project.version}</version>
42-
<scope>test</scope>
43-
</dependency>
44-
</dependencies>
32+
<!-- test dependencies -->
33+
<dependency>
34+
<groupId>io.prometheus</groupId>
35+
<artifactId>prometheus-metrics-exporter-httpserver</artifactId>
36+
<version>${project.version}</version>
37+
<scope>test</scope>
38+
</dependency>
39+
<dependency>
40+
<groupId>io.prometheus</groupId>
41+
<artifactId>prometheus-metrics-exposition-textformats</artifactId>
42+
<version>${project.version}</version>
43+
<scope>test</scope>
44+
</dependency>
45+
</dependencies>
4546
</project>

‎simpleclient-archive/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Archived simpleclient modules
22

3-
This is not functional source code. We just keep these files around so we don't loose the GitHub history once we copy them to the new 1.0.x modules.
3+
This is not functional source code. We just keep these files around so we don't
4+
lose the GitHub history once we copy them to the new 1.0.x modules.
45

5-
If you are looking for the source code for the latest 0.x.x release, see the [simpleclient](https://github.com/prometheus/client_java/tree/simpleclient) branch.
6+
If you are looking for the source code for the latest 0.x.x release, see
7+
the [simpleclient](https://github.com/prometheus/client_java/tree/simpleclient) branch.

‎simpleclient-archive/integration_tests/it_common/src/test/resources/project_version.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
# ${project.version} will be replaced by Maven at built time when this file is copied to the target/ directory.
2-
project.version=${project.version}
1+
# ${project.version} will be replaced by Maven at built time
2+
# when this file is copied to the target/ directory.
3+
project.version=${project.version}

‎simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
5-
version="5.0">
6-
<!-- Anyone still using web.xml in 2021? -->
7-
<servlet>
8-
<servlet-name>example</servlet-name>
9-
<servlet-class>io.prometheus.client.it.servlet.jakarta.ExampleServlet</servlet-class>
10-
<load-on-startup/>
11-
</servlet>
12-
<filter>
13-
<filter-name>prometheus</filter-name>
14-
<filter-class>io.prometheus.client.servlet.jakarta.filter.MetricsFilter</filter-class>
15-
<init-param>
16-
<param-name>metric-name</param-name>
17-
<param-value>requests</param-value>
18-
</init-param>
19-
</filter>
20-
<servlet>
21-
<servlet-name>prometheus-exporter</servlet-name>
22-
<servlet-class>io.prometheus.client.servlet.jakarta.exporter.MetricsServlet</servlet-class>
23-
<init-param>
24-
<param-name>name-must-not-start-with</param-name>
25-
<param-value>
26-
jvm_threads_deadlocked
27-
jvm_memory_pool
28-
</param-value>
29-
</init-param>
30-
</servlet>
31-
<servlet-mapping>
32-
<servlet-name>example</servlet-name>
33-
<url-pattern>/*</url-pattern>
34-
</servlet-mapping>
35-
<servlet-mapping>
36-
<servlet-name>prometheus-exporter</servlet-name>
37-
<url-pattern>/metrics</url-pattern>
38-
</servlet-mapping>
39-
<filter-mapping>
40-
<filter-name>prometheus</filter-name>
41-
<servlet-name>example</servlet-name>
42-
</filter-mapping>
43-
</web-app>
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
5+
https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
6+
version="5.0">
7+
<!-- Anyone still using web.xml in 2021? -->
8+
<servlet>
9+
<servlet-name>example</servlet-name>
10+
<servlet-class>io.prometheus.client.it.servlet.jakarta.ExampleServlet</servlet-class>
11+
<load-on-startup/>
12+
</servlet>
13+
<filter>
14+
<filter-name>prometheus</filter-name>
15+
<filter-class>io.prometheus.client.servlet.jakarta.filter.MetricsFilter</filter-class>
16+
<init-param>
17+
<param-name>metric-name</param-name>
18+
<param-value>requests</param-value>
19+
</init-param>
20+
</filter>
21+
<servlet>
22+
<servlet-name>prometheus-exporter</servlet-name>
23+
<servlet-class>io.prometheus.client.servlet.jakarta.exporter.MetricsServlet</servlet-class>
24+
<init-param>
25+
<param-name>name-must-not-start-with</param-name>
26+
<param-value>
27+
jvm_threads_deadlocked
28+
jvm_memory_pool
29+
</param-value>
30+
</init-param>
31+
</servlet>
32+
<servlet-mapping>
33+
<servlet-name>example</servlet-name>
34+
<url-pattern>/*</url-pattern>
35+
</servlet-mapping>
36+
<servlet-mapping>
37+
<servlet-name>prometheus-exporter</servlet-name>
38+
<url-pattern>/metrics</url-pattern>
39+
</servlet-mapping>
40+
<filter-mapping>
41+
<filter-name>prometheus</filter-name>
42+
<servlet-name>example</servlet-name>
43+
</filter-mapping>
44+
</web-app>

0 commit comments

Comments
 (0)