Skip to content

Commit b0c21d0

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

File tree

38 files changed

+1921
-1905
lines changed
  • .github
  • examples
    • example-exemplars-tail-sampling
    • example-exporter-httpserver
    • example-exporter-opentelemetry
    • example-exporter-servlet-tomcat
    • example-native-histogram
    • example-prometheus-properties
    • example-simpleclient-bridge
  • integration-tests
  • prometheus-metrics-bom
  • prometheus-metrics-config
  • prometheus-metrics-core
  • prometheus-metrics-exporter-common
  • prometheus-metrics-exporter-httpserver
  • prometheus-metrics-exporter-opentelemetry-otel-agent-resources
  • prometheus-metrics-exporter-opentelemetry-shaded
  • prometheus-metrics-exporter-opentelemetry
  • prometheus-metrics-exporter-pushgateway
  • prometheus-metrics-exporter-servlet-jakarta
  • prometheus-metrics-exporter-servlet-javax
  • prometheus-metrics-exposition-formats-shaded
  • prometheus-metrics-exposition-formats
  • prometheus-metrics-exposition-textformats
  • prometheus-metrics-instrumentation-caffeine
  • prometheus-metrics-instrumentation-dropwizard5
  • prometheus-metrics-instrumentation-dropwizard
  • prometheus-metrics-instrumentation-guava
  • prometheus-metrics-model
  • prometheus-metrics-simpleclient-bridge
  • prometheus-metrics-tracer

38 files changed

+1921
-1905
lines changed

‎.github/super-linter.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FILTER_REGEX_EXCLUDE=mvnw|src/main/generated/.*|docs/themes/.*
1+
FILTER_REGEX_EXCLUDE=mvnw|src/main/generated/.*|docs/themes/.*|keystore.pkcs12
22
IGNORE_GITIGNORED_FILES=true
33
JAVA_FILE_NAME=google_checks.xml
44
# disable kubernetes linter - complains about resource limits, etc

‎examples/example-exemplars-tail-sampling/pom.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>io.prometheus</groupId>
9-
<artifactId>examples</artifactId>
10-
<version>1.4.0-SNAPSHOT</version>
11-
</parent>
7+
<parent>
8+
<groupId>io.prometheus</groupId>
9+
<artifactId>examples</artifactId>
10+
<version>1.4.0-SNAPSHOT</version>
11+
</parent>
1212

13-
<artifactId>example-exemplars-tail-sampling</artifactId>
14-
<packaging>pom</packaging>
13+
<artifactId>example-exemplars-tail-sampling</artifactId>
14+
<packaging>pom</packaging>
1515

16-
<name>Example - Exemplars with OpenTelemetry's Tail Sampling</name>
17-
<description>
18-
Example project showing Examplars with OpenTelemetry's Tail Sampling.
19-
</description>
16+
<name>Example - Exemplars with OpenTelemetry's Tail Sampling</name>
17+
<description>
18+
Example project showing Examplars with OpenTelemetry's Tail Sampling.
19+
</description>
2020

21-
<properties>
22-
<java.version>11</java.version>
23-
</properties>
21+
<properties>
22+
<java.version>11</java.version>
23+
</properties>
2424

25-
<modules>
26-
<module>example-greeting-service</module>
27-
<module>example-hello-world-app</module>
28-
</modules>
25+
<modules>
26+
<module>example-greeting-service</module>
27+
<module>example-hello-world-app</module>
28+
</modules>
2929
</project>

‎examples/example-exporter-httpserver/pom.xml‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,62 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>io.prometheus</groupId>
9-
<artifactId>examples</artifactId>
10-
<version>1.4.0-SNAPSHOT</version>
11-
</parent>
7+
<parent>
8+
<groupId>io.prometheus</groupId>
9+
<artifactId>examples</artifactId>
10+
<version>1.4.0-SNAPSHOT</version>
11+
</parent>
1212

13-
<artifactId>example-exporter-httpserver</artifactId>
13+
<artifactId>example-exporter-httpserver</artifactId>
1414

15-
<name>Example - HTTPServer Exporter</name>
16-
<description>
17-
Prometheus Metrics Example using the HTTPServer for exposing the metrics endpoint
18-
</description>
15+
<name>Example - HTTPServer Exporter</name>
16+
<description>
17+
Prometheus Metrics Example using the HTTPServer for exposing the metrics endpoint
18+
</description>
1919

20-
<dependencies>
21-
<dependency>
22-
<groupId>io.prometheus</groupId>
23-
<artifactId>prometheus-metrics-core</artifactId>
24-
<version>${project.version}</version>
25-
</dependency>
26-
<dependency>
27-
<groupId>io.prometheus</groupId>
28-
<artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
29-
<version>${project.version}</version>
30-
</dependency>
31-
<dependency>
32-
<groupId>io.prometheus</groupId>
33-
<artifactId>prometheus-metrics-exporter-httpserver</artifactId>
34-
<version>${project.version}</version>
35-
</dependency>
36-
</dependencies>
20+
<dependencies>
21+
<dependency>
22+
<groupId>io.prometheus</groupId>
23+
<artifactId>prometheus-metrics-core</artifactId>
24+
<version>${project.version}</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>io.prometheus</groupId>
28+
<artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
29+
<version>${project.version}</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>io.prometheus</groupId>
33+
<artifactId>prometheus-metrics-exporter-httpserver</artifactId>
34+
<version>${project.version}</version>
35+
</dependency>
36+
</dependencies>
3737

38-
<build>
39-
<finalName>${project.artifactId}</finalName>
40-
<plugins>
41-
<plugin>
42-
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-shade-plugin</artifactId>
44-
<executions>
45-
<execution>
46-
<phase>package</phase>
47-
<goals>
48-
<goal>shade</goal>
49-
</goals>
50-
<configuration>
51-
<transformers>
52-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
53-
<mainClass>io.prometheus.metrics.examples.httpserver.Main</mainClass>
54-
</transformer>
55-
</transformers>
56-
</configuration>
57-
</execution>
58-
</executions>
59-
</plugin>
60-
</plugins>
61-
</build>
38+
<build>
39+
<finalName>${project.artifactId}</finalName>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-shade-plugin</artifactId>
44+
<executions>
45+
<execution>
46+
<phase>package</phase>
47+
<goals>
48+
<goal>shade</goal>
49+
</goals>
50+
<configuration>
51+
<transformers>
52+
<transformer
53+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
54+
<mainClass>io.prometheus.metrics.examples.httpserver.Main</mainClass>
55+
</transformer>
56+
</transformers>
57+
</configuration>
58+
</execution>
59+
</executions>
60+
</plugin>
61+
</plugins>
62+
</build>
6263
</project>

‎examples/example-exporter-opentelemetry/pom.xml‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,62 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
5+
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>io.prometheus</groupId>
9-
<artifactId>examples</artifactId>
10-
<version>1.4.0-SNAPSHOT</version>
11-
</parent>
7+
<parent>
8+
<groupId>io.prometheus</groupId>
9+
<artifactId>examples</artifactId>
10+
<version>1.4.0-SNAPSHOT</version>
11+
</parent>
1212

13-
<artifactId>example-exporter-opentelemetry</artifactId>
13+
<artifactId>example-exporter-opentelemetry</artifactId>
1414

15-
<name>Example - OpenTelemetry Metrics Exporter</name>
16-
<description>
17-
Example of exposing metrics in OpenTelemetry format and pushing them to an OpenTelemetry collector
18-
</description>
15+
<name>Example - OpenTelemetry Metrics Exporter</name>
16+
<description>
17+
Example of exposing metrics in OpenTelemetry format and pushing them to an OpenTelemetry collector
18+
</description>
1919

20-
<dependencies>
21-
<dependency>
22-
<groupId>io.prometheus</groupId>
23-
<artifactId>prometheus-metrics-core</artifactId>
24-
<version>${project.version}</version>
25-
</dependency>
26-
<dependency>
27-
<groupId>io.prometheus</groupId>
28-
<artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
29-
<version>${project.version}</version>
30-
</dependency>
31-
<dependency>
32-
<groupId>io.prometheus</groupId>
33-
<artifactId>prometheus-metrics-exporter-opentelemetry</artifactId>
34-
<version>${project.version}</version>
35-
</dependency>
36-
</dependencies>
20+
<dependencies>
21+
<dependency>
22+
<groupId>io.prometheus</groupId>
23+
<artifactId>prometheus-metrics-core</artifactId>
24+
<version>${project.version}</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>io.prometheus</groupId>
28+
<artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
29+
<version>${project.version}</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>io.prometheus</groupId>
33+
<artifactId>prometheus-metrics-exporter-opentelemetry</artifactId>
34+
<version>${project.version}</version>
35+
</dependency>
36+
</dependencies>
3737

38-
<build>
39-
<finalName>${project.artifactId}</finalName>
40-
<plugins>
41-
<plugin>
42-
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-shade-plugin</artifactId>
44-
<executions>
45-
<execution>
46-
<phase>package</phase>
47-
<goals>
48-
<goal>shade</goal>
49-
</goals>
50-
<configuration>
51-
<transformers>
52-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
53-
<mainClass>io.prometheus.metrics.examples.opentelemetry.Main</mainClass>
54-
</transformer>
55-
</transformers>
56-
</configuration>
57-
</execution>
58-
</executions>
59-
</plugin>
60-
</plugins>
61-
</build>
38+
<build>
39+
<finalName>${project.artifactId}</finalName>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-shade-plugin</artifactId>
44+
<executions>
45+
<execution>
46+
<phase>package</phase>
47+
<goals>
48+
<goal>shade</goal>
49+
</goals>
50+
<configuration>
51+
<transformers>
52+
<transformer
53+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
54+
<mainClass>io.prometheus.metrics.examples.opentelemetry.Main</mainClass>
55+
</transformer>
56+
</transformers>
57+
</configuration>
58+
</execution>
59+
</executions>
60+
</plugin>
61+
</plugins>
62+
</build>
6263
</project>

0 commit comments

Comments
 (0)