Skip to content

Commit

Permalink
Merge pull request #13 from dm-drogeriemarkt/upgrade_to_spring_boot_3
Browse files Browse the repository at this point in the history
upgrade to spring-boot 3
  • Loading branch information
dominikjohsdmde authored Jan 31, 2023
2 parents a692110 + 49521c4 commit 4c66b24
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 23 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ you will get the following measurements for every ```public``` method of the ```
## Runtime Dependencies

- Java >= 17
- Spring Boot >= 2.7.6
- Spring Boot >= 3.0.2

The library was compiled against:

- Spring Boot Acutator 2.7.6
- Spring Boot Acutator 3.0.2

## Installation
```
<dependency>
<groupId>de.dm.infrastructure</groupId>
<artifactId>micrometer-metrics-wrapper</artifactId>
<version>1.4.1</version>
<version>2.0.0</version>
</dependency>
```

Expand Down Expand Up @@ -82,7 +82,7 @@ The library contains a default [micrometer-registry-statsd](https://github.com/m
You can change this by setting the flavor property:

```
management.metrics.export.statsd.flavor
management.statsd.metrics.export.flavor
```

The library also contains a set of default metrics which are provided from the [spring-boot-actuator](https://github.com/spring-projects/spring-boot/tree/master/spring-boot-project/spring-boot-actuator)
Expand Down
10 changes: 2 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>de.dm.infrastructure</groupId>
<artifactId>micrometer-metrics-wrapper</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>

<name>micrometer-metrics-wrapper</name>
<description>Micrometer wrapper to allow generic class level metric values</description>
Expand All @@ -32,18 +32,12 @@
<name>Dominik Johs</name>
<email>[email protected]</email>
</developer>
<developer>
<organization>dmTECH GmbH</organization>
<organizationUrl>https://www.dmtech.de</organizationUrl>
<name>Samuel Abt</name>
<email>[email protected]</email>
</developer>
</developers>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.6</version>
<version>3.0.2</version>
<relativePath/>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
import de.dm.infrastructure.metrics.aop.MetricAnnotationAdvisor;
import de.dm.infrastructure.metrics.binder.GenericClassMethodMetrics;
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;

@Configuration
@AutoConfiguration
@AutoConfigureAfter(CompositeMeterRegistryAutoConfiguration.class)
public class MicrometerMetricsAutoConfiguration {

Expand Down
1 change: 0 additions & 1 deletion src/main/resources/META-INF/spring.factories

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
de.dm.infrastructure.metrics.MicrometerMetricsAutoConfiguration
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package de.dm.infrastructure.metrics.testfixtures;

import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;

@Entity
public class TrivialDomain {
Expand Down
3 changes: 0 additions & 3 deletions src/test/resources/application.properties

This file was deleted.

6 changes: 6 additions & 0 deletions src/test/resources/application.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
management:
statsd:
metrics:
export:
enabled: true
flavor: telegraf

0 comments on commit 4c66b24

Please sign in to comment.