D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

info from effective-pom in /metrics

This commit is contained in:
Michele Artini 2021-05-11 12:28:20 +02:00
parent e360f29f8c
commit fea7c78695
10 changed files with 48 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/dhp-broker-application/pom.xml
View File

@ -36,27 +36,14 @@
</dependencies> </dependencies>
<build> <build>
<resources>
<resource>
<directory>.</directory>
<includes>
<include>pom.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/java</directory>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

2
apps/dhp-broker-application/src/main/resources/application.properties
View File

@ -2,6 +2,8 @@ spring.profiles.active = dev,openaire
#logging.level.root=DEBUG #logging.level.root=DEBUG
maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dhp-broker-application/effective-pom.xml
management.endpoints.web.exposure.include = prometheus,health management.endpoints.web.exposure.include = prometheus,health
management.endpoints.web.base-path = / management.endpoints.web.base-path = /
management.endpoints.web.path-mapping.prometheus = metrics management.endpoints.web.path-mapping.prometheus = metrics

21
apps/dhp-broker-public-application/pom.xml
View File

@ -45,27 +45,14 @@
</dependencies> </dependencies>
<build> <build>
<resources>
<resource>
<directory>.</directory>
<includes>
<include>pom.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/java</directory>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

3
apps/dhp-broker-public-application/src/main/resources/application.properties
View File

@ -1,8 +1,9 @@
spring.profiles.active = dev,openaire spring.profiles.active = dev,openaire
#logging.level.root=DEBUG #logging.level.root=DEBUG
maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dhp-broker-public-application/effective-pom.xml
management.endpoints.web.exposure.include = prometheus,health management.endpoints.web.exposure.include = prometheus,health
management.endpoints.web.base-path = / management.endpoints.web.base-path = /
management.endpoints.web.path-mapping.prometheus = metrics management.endpoints.web.path-mapping.prometheus = metrics

21
apps/dhp-mdstore-manager/pom.xml
View File

@ -84,27 +84,14 @@
<build> <build>
<resources>
<resource>
<directory>.</directory>
<includes>
<include>pom.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/java</directory>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

3
apps/dhp-mdstore-manager/src/main/resources/application.properties
View File

@ -1,6 +1,9 @@
spring.main.banner-mode = console spring.main.banner-mode = console
logging.level.root = INFO logging.level.root = INFO
maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dhp-mdstore-manager/effective-pom.xml
spring.thymeleaf.cache=false spring.thymeleaf.cache=false
management.endpoints.web.exposure.include = prometheus,health management.endpoints.web.exposure.include = prometheus,health

21
apps/dnet-orgs-database-application/pom.xml
View File

@ -69,27 +69,14 @@
</dependencies> </dependencies>
<build> <build>
<resources>
<resource>
<directory>.</directory>
<includes>
<include>pom.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/java</directory>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

2
apps/dnet-orgs-database-application/src/main/resources/application.properties
View File

@ -2,6 +2,8 @@ server.port=8480
spring.profiles.active=dev spring.profiles.active=dev
maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dnet-orgs-database-application/effective-pom.xml
spring.main.banner-mode = off spring.main.banner-mode = off
logging.level.root = INFO logging.level.root = INFO

21
apps/pom.xml
View File

@ -1,4 +1,6 @@
<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"> <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">
<parent> <parent>
<groupId>eu.dnetlib.dhp</groupId> <groupId>eu.dnetlib.dhp</groupId>
@ -42,12 +44,27 @@
<artifactId>dnet-apps-common</artifactId> <artifactId>dnet-apps-common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>effective-pom</goal>
</goals>
<configuration>
<output>${project.build.outputDirectory}/META-INF/maven/${project.groupId}/${project.artifactId}/effective-pom.xml</output>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>

8
libs/dnet-apps-common/src/main/java/eu/dnetlib/common/app/AbstractDnetApp.java
View File

@ -23,7 +23,7 @@ import springfox.documentation.spring.web.plugins.Docket;
public abstract class AbstractDnetApp { public abstract class AbstractDnetApp {
@Value("pom.xml") @Value("${maven.pom.path}")
private ClassPathResource pom; private ClassPathResource pom;
private static final Logger log = LoggerFactory.getLogger(AbstractDnetApp.class); private static final Logger log = LoggerFactory.getLogger(AbstractDnetApp.class);
@ -37,10 +37,10 @@ public abstract class AbstractDnetApp {
log.info(String.format("registering metric for %s", model.getArtifactId())); log.info(String.format("registering metric for %s", model.getArtifactId()));
final ImmutableTag tag1 = new ImmutableTag("component", model.getGroupId() + ":" + model.getArtifactId()); final ImmutableTag tag1 = new ImmutableTag("component", model.getGroupId() + ":" + model.getArtifactId());
// final ImmutableTag tag2 = new ImmutableTag("version", model.getVersion()); final ImmutableTag tag2 = new ImmutableTag("version", model.getVersion());
// final ImmutableTag tag3 = new ImmutableTag("scmtag", model.getScm().getTag()); final ImmutableTag tag3 = new ImmutableTag("scmtag", model.getScm().getTag());
Metrics.gauge("micrometer_info", Lists.newArrayList(tag1), 1); Metrics.gauge("micrometer_info", Lists.newArrayList(tag1, tag2, tag3), 1);
} catch (IOException | XmlPullParserException e) { } catch (IOException | XmlPullParserException e) {
log.error("Error registering metric", e); log.error("Error registering metric", e);
} }