-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into update-from-template-merged
- Loading branch information
Showing
19 changed files
with
466 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # 3.0.0 | ||
| * In theory the library is [no longer required](https://prometheus.github.io/client_java/exporters/formats/#exclude-protobuf-exposition-format), however [there are still some problems with how the changes have been implemented upstream](https://github.com/xdev-software/prometheus-metrics-exposition-formats-no-protobuf/issues/27). | ||
| * Library now completely removes protobuf functionality | ||
| * ``PrometheusProtobufWriter`` is no longer loaded in the first place | ||
| * Removed shading once again | ||
|
|
||
| # 2.0.0 | ||
| * Make exclusion work in ``prometheus-metrics-exposition-formats`` 1.3.2+ #3 | ||
| * ``prometheus-metrics-exposition-formats`` is now directly included using shading | ||
| * All protobuf code is removed during shading | ||
| * This is a workaround until https://github.com/prometheus/client_java/pull/1190 is merged | ||
|
|
||
| # 1.0.0 | ||
| _Initial release_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
prometheus-metrics-exposition-formats-no-protobuf-demo/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>software.xdev</groupId> | ||
| <artifactId>prometheus-metrics-exposition-formats-no-protobuf-root</artifactId> | ||
| <version>3.0.1-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>prometheus-metrics-exposition-formats-no-protobuf-demo</artifactId> | ||
| <version>3.0.1-SNAPSHOT</version> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <organization> | ||
| <name>XDEV Software</name> | ||
| <url>https://xdev.software</url> | ||
| </organization> | ||
|
|
||
| <properties> | ||
| <javaVersion>17</javaVersion> | ||
| <maven.compiler.release>${javaVersion}</maven.compiler.release> | ||
|
|
||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
|
|
||
| <mainClass>software.xdev.Application</mainClass> | ||
|
|
||
| <org.springframework.boot.version>3.4.1</org.springframework.boot.version> | ||
| </properties> | ||
|
|
||
| <dependencyManagement> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-dependencies</artifactId> | ||
| <version>${org.springframework.boot.version}</version> | ||
| <type>pom</type> | ||
| <scope>import</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </dependencyManagement> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>software.xdev</groupId> | ||
| <artifactId>prometheus-metrics-exposition-formats-no-protobuf</artifactId> | ||
| <version>${project.version}</version> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-starter-web</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-starter-actuator</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>io.micrometer</groupId> | ||
| <artifactId>micrometer-registry-prometheus</artifactId> | ||
| <exclusions> | ||
| <!-- Exclude default module so that dependency is properly removed --> | ||
| <exclusion> | ||
| <groupId>io.prometheus</groupId> | ||
| <artifactId>prometheus-metrics-exposition-formats</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| <scope>runtime</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <finalName>${project.artifactId}</finalName> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.13.0</version> | ||
| <configuration> | ||
| <release>${maven.compiler.release}</release> | ||
| <compilerArgs> | ||
| <arg>-proc:none</arg> | ||
| </compilerArgs> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-maven-plugin</artifactId> | ||
| <version>${org.springframework.boot.version}</version> | ||
| <configuration> | ||
| <mainClass>${mainClass}</mainClass> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>repackage</id> | ||
| <goals> | ||
| <goal>repackage</goal> | ||
| </goals> | ||
| <phase>package</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
15 changes: 15 additions & 0 deletions
15
...-metrics-exposition-formats-no-protobuf-demo/src/main/java/software/xdev/Application.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package software.xdev; | ||
|
|
||
| import org.springframework.boot.SpringApplication; | ||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | ||
|
|
||
|
|
||
| @SuppressWarnings("checkstyle:HideUtilityClassConstructor") | ||
| @SpringBootApplication | ||
| public class Application | ||
| { | ||
| public static void main(final String[] args) | ||
| { | ||
| SpringApplication.run(Application.class, args); | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
...tion-formats-no-protobuf-demo/src/main/java/software/xdev/controllers/RootController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package software.xdev.controllers; | ||
|
|
||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
|
|
||
| @RestController | ||
| @RequestMapping("/") | ||
| public class RootController | ||
| { | ||
| @GetMapping | ||
| public String respond() | ||
| { | ||
| return """ | ||
| <html> | ||
| <body> | ||
| Go to <a href="/actuator/prometheus">Prometheus metrics</a> | ||
| </body> | ||
| </html> | ||
| """; | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
prometheus-metrics-exposition-formats-no-protobuf-demo/src/main/resources/application.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| management: | ||
| endpoints: | ||
| web: | ||
| exposure: | ||
| include: "*" | ||
| # Env is potentially security sensitive so better hide it | ||
| exclude: "env" | ||
| endpoint: | ||
| health: | ||
| show-details: "when-authorized" | ||
| health: | ||
| # Kubernetes probes | ||
| probes: | ||
| enabled: true |
Oops, something went wrong.