Skip to content

Commit 79112d1

Browse files
zeitlingerzeitlinger
committed
lint
Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 43d1d09 commit 79112d1

File tree

8 files changed

+219
-210
lines changed

8 files changed

+219
-210
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ root = true
44
max_line_length = 100
55
indent_size = 2
66

7-
[version-rules.xml]
7+
[{version-rules.xml,maven-wrapper.properties}]
88
max_line_length = 200
99

1010
[*.java]
1111
# checked by google-java-format
1212
max_line_length = 200
1313

1414
[pom.xml]
15-
indent_size = 4
15+
max_line_length = 110
1616

1717
[*.py]
1818
# checked by black

‎.github/workflows/github-pages.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ on:
2020

2121
permissions: {}
2222

23-
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
24-
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
23+
# Allow only one concurrent deployment, skipping runs queued between
24+
# the run in-progress and latest queued.
25+
# However, do NOT cancel in-progress runs as we want to allow
26+
# these production deployments to complete.
2527
concurrency:
2628
group: "pages"
2729
cancel-in-progress: false

‎CODE_OF_CONDUCT.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Prometheus Community Code of Conduct
22

3-
Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
3+
Prometheus follows the
4+
[CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ If you're getting errors when running tests:
3333
- Use `-Dwarnings=-nowarn` to skip the warnings during development.
3434

3535
Combine all with
36-
`./mvnw test -DskipTests=true -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn`.
36+
`./mvnw test -DskipTests=true -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn`. # editorconfig-checker-disable-line
3737

3838
## Updating the Protobuf Java Classes
3939

‎benchmarks/pom.xml‎

Lines changed: 116 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,125 @@
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"
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>
2+
<project
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
6+
<modelVersion>4.0.0</modelVersion>
57

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

12-
<artifactId>benchmarks</artifactId>
14+
<artifactId>benchmarks</artifactId>
1315

14-
<name>Prometheus Java Client Benchmarks</name>
15-
<description>
16-
Benchmarks of client performance, and comparison to other systems.
17-
</description>
16+
<name>Prometheus Java Client Benchmarks</name>
17+
<description>
18+
Benchmarks of client performance, and comparison to other systems.
19+
</description>
1820

19-
<properties>
20-
<jmh.version>1.37</jmh.version>
21-
<simpleclient.version>0.16.0</simpleclient.version>
22-
<codahale.version>3.0.2</codahale.version>
23-
<coverage.skip>true</coverage.skip>
24-
</properties>
25-
26-
<dependencyManagement>
27-
<dependencies>
28-
<dependency>
29-
<groupId>io.opentelemetry.instrumentation</groupId>
30-
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
31-
<version>${otel.instrumentation.version}</version>
32-
<type>pom</type>
33-
<scope>import</scope>
34-
</dependency>
35-
</dependencies>
36-
</dependencyManagement>
21+
<properties>
22+
<jmh.version>1.37</jmh.version>
23+
<simpleclient.version>0.16.0</simpleclient.version>
24+
<codahale.version>3.0.2</codahale.version>
25+
<coverage.skip>true</coverage.skip>
26+
</properties>
3727

28+
<dependencyManagement>
3829
<dependencies>
39-
<dependency>
40-
<groupId>org.openjdk.jmh</groupId>
41-
<artifactId>jmh-core</artifactId>
42-
<version>${jmh.version}</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>io.prometheus</groupId>
46-
<artifactId>prometheus-metrics-core</artifactId>
47-
<version>${project.version}</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>io.prometheus</groupId>
51-
<artifactId>prometheus-metrics-exposition-textformats</artifactId>
52-
<version>${project.version}</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>io.prometheus</groupId>
56-
<artifactId>simpleclient</artifactId>
57-
<version>${simpleclient.version}</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>com.codahale.metrics</groupId>
61-
<artifactId>metrics-core</artifactId>
62-
<version>${codahale.version}</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>io.opentelemetry</groupId>
66-
<artifactId>opentelemetry-api</artifactId>
67-
</dependency>
68-
<dependency>
69-
<groupId>io.opentelemetry</groupId>
70-
<artifactId>opentelemetry-sdk</artifactId>
71-
</dependency>
72-
<dependency>
73-
<groupId>io.opentelemetry</groupId>
74-
<artifactId>opentelemetry-sdk-testing</artifactId>
75-
</dependency>
30+
<dependency>
31+
<groupId>io.opentelemetry.instrumentation</groupId>
32+
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
33+
<version>${otel.instrumentation.version}</version>
34+
<type>pom</type>
35+
<scope>import</scope>
36+
</dependency>
7637
</dependencies>
77-
<build>
78-
<finalName>${project.artifactId}</finalName>
79-
<plugins>
80-
<plugin>
81-
<groupId>org.apache.maven.plugins</groupId>
82-
<artifactId>maven-compiler-plugin</artifactId>
83-
<configuration>
84-
<source>1.8</source>
85-
<target>1.8</target>
86-
<compilerArgs>
87-
<!-- need to add parameters to prevent inheritance -->
88-
<arg>-parameters</arg>
89-
</compilerArgs>
90-
<annotationProcessorPaths>
91-
<path>
92-
<groupId>org.openjdk.jmh</groupId>
93-
<artifactId>jmh-generator-annprocess</artifactId>
94-
<version>${jmh.version}</version>
95-
</path>
96-
</annotationProcessorPaths>
97-
</configuration>
98-
</plugin>
99-
<plugin>
100-
<groupId>org.apache.maven.plugins</groupId>
101-
<artifactId>maven-shade-plugin</artifactId>
102-
<executions>
103-
<execution>
104-
<phase>package</phase>
105-
<goals>
106-
<goal>shade</goal>
107-
</goals>
108-
<configuration>
109-
<finalName>benchmarks</finalName>
110-
<transformers>
111-
<transformer
112-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
113-
<mainClass>io.prometheus.metrics.benchmarks.BenchmarkRunner</mainClass>
114-
</transformer>
115-
</transformers>
116-
</configuration>
117-
</execution>
118-
</executions>
119-
</plugin>
120-
</plugins>
121-
</build>
38+
</dependencyManagement>
39+
40+
<dependencies>
41+
<dependency>
42+
<groupId>org.openjdk.jmh</groupId>
43+
<artifactId>jmh-core</artifactId>
44+
<version>${jmh.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.prometheus</groupId>
48+
<artifactId>prometheus-metrics-core</artifactId>
49+
<version>${project.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.prometheus</groupId>
53+
<artifactId>prometheus-metrics-exposition-textformats</artifactId>
54+
<version>${project.version}</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>io.prometheus</groupId>
58+
<artifactId>simpleclient</artifactId>
59+
<version>${simpleclient.version}</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>com.codahale.metrics</groupId>
63+
<artifactId>metrics-core</artifactId>
64+
<version>${codahale.version}</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>io.opentelemetry</groupId>
68+
<artifactId>opentelemetry-api</artifactId>
69+
</dependency>
70+
<dependency>
71+
<groupId>io.opentelemetry</groupId>
72+
<artifactId>opentelemetry-sdk</artifactId>
73+
</dependency>
74+
<dependency>
75+
<groupId>io.opentelemetry</groupId>
76+
<artifactId>opentelemetry-sdk-testing</artifactId>
77+
</dependency>
78+
</dependencies>
79+
<build>
80+
<finalName>${project.artifactId}</finalName>
81+
<plugins>
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-compiler-plugin</artifactId>
85+
<configuration>
86+
<source>1.8</source>
87+
<target>1.8</target>
88+
<compilerArgs>
89+
<!-- need to add parameters to prevent inheritance -->
90+
<arg>-parameters</arg>
91+
</compilerArgs>
92+
<annotationProcessorPaths>
93+
<path>
94+
<groupId>org.openjdk.jmh</groupId>
95+
<artifactId>jmh-generator-annprocess</artifactId>
96+
<version>${jmh.version}</version>
97+
</path>
98+
</annotationProcessorPaths>
99+
</configuration>
100+
</plugin>
101+
<plugin>
102+
<groupId>org.apache.maven.plugins</groupId>
103+
<artifactId>maven-shade-plugin</artifactId>
104+
<executions>
105+
<execution>
106+
<phase>package</phase>
107+
<goals>
108+
<goal>shade</goal>
109+
</goals>
110+
<configuration>
111+
<finalName>benchmarks</finalName>
112+
<transformers>
113+
<transformer
114+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
115+
<mainClass>io.prometheus.metrics.benchmarks.BenchmarkRunner
116+
</mainClass>
117+
</transformer>
118+
</transformers>
119+
</configuration>
120+
</execution>
121+
</executions>
122+
</plugin>
123+
</plugins>
124+
</build>
122125
</project>

0 commit comments

Comments
 (0)