Skip to content

Commit deb7234

Browse files
committed
Upgrade parent 27.7.1 and added new profile for OTLP
1 parent 0451f57 commit deb7234

2 files changed

Lines changed: 31 additions & 22 deletions

File tree

pom.xml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<parent>
77
<groupId>org.openwms</groupId>
88
<artifactId>org.openwms.parent</artifactId>
9-
<version>27.6</version>
10-
<relativePath />
9+
<version>27.7.1</version>
10+
<relativePath/>
1111
</parent>
1212
<artifactId>org.openwms.services</artifactId>
1313
<version>2.4.0-SNAPSHOT</version>
@@ -42,7 +42,7 @@
4242
<url>https://openwms.github.io/</url>
4343
<organization>Interface21.io</organization>
4444
<organizationUrl>https://www.interface21.io</organizationUrl>
45-
<timezone>+2</timezone>
45+
<timezone>+1</timezone>
4646
<roles>
4747
<role>Project Lead</role>
4848
<role>Architect</role>
@@ -66,12 +66,11 @@
6666
</ciManagement>
6767

6868
<properties>
69-
<error_prone_annotations.version>2.40.0</error_prone_annotations.version>
69+
<error_prone_annotations.version>2.43.0</error_prone_annotations.version>
7070
<hk2-api.version>3.1.1</hk2-api.version>
7171
<guava.version>33.0.0-jre</guava.version>
7272
<httpclient.version>4.5.14</httpclient.version>
7373
<spring-cloud-dependencies.version>2025.0.0</spring-cloud-dependencies.version>
74-
<stax2-api.version>4.2.2</stax2-api.version>
7574
<woodstox-core.version>7.1.1</woodstox-core.version>
7675
</properties>
7776

@@ -143,12 +142,6 @@
143142
<artifactId>guava</artifactId>
144143
<version>${guava.version}</version>
145144
</dependency>
146-
<dependency>
147-
<!-- Clash in org.springframework.cloud:spring-cloud-starter-netflix-eureka-server -->
148-
<groupId>org.codehaus.woodstox</groupId>
149-
<artifactId>stax2-api</artifactId>
150-
<version>${stax2-api.version}</version>
151-
</dependency>
152145
<dependency>
153146
<!-- Internal clash in Spring Cloud -->
154147
<groupId>org.apache.httpcomponents</groupId>

src/main/resources/application.yml

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ owms:
1313
srv:
1414
hostname: localhost
1515
protocol: http
16-
tracing:
17-
url: http://localhost:4317
1816

1917
server:
2018
port: ${PORT:8761}
2119

20+
springdoc:
21+
api-docs:
22+
enabled: false
23+
swagger-ui:
24+
enabled: false
25+
2226
# https://medium.com/@fahimfarookme/the-mystery-of-eureka-self-preservation-c7aa0ed1b799
2327
eureka:
2428
client:
@@ -59,9 +63,9 @@ eureka:
5963
protocol: ${owms.srv.protocol}
6064
username: ${spring.security.user.name}
6165
zone: ${owms.eureka.zone}
62-
prometheus.scrape: "true"
63-
prometheus.path: "/actuator/prometheus"
64-
prometheus.port: ${server.port}
66+
"[prometheus.scrape]": "true"
67+
"[prometheus.path]": "/actuator/prometheus"
68+
"[prometheus.port]": ${server.port}
6569
non-secure-port-enabled: true
6670
secure-port-enabled: false
6771

@@ -77,6 +81,24 @@ management:
7781
info:
7882
git:
7983
mode: simple
84+
prometheus:
85+
metrics:
86+
export:
87+
enabled: true
88+
server:
89+
port: ${MGMTPORT:8990}
90+
91+
---
92+
spring:
93+
config:
94+
activate:
95+
on-profile: OTLP
96+
97+
owms:
98+
tracing:
99+
url: http://localhost:4317
100+
101+
management:
80102
metrics:
81103
distribution:
82104
percentiles-histogram:
@@ -89,12 +111,6 @@ management:
89111
otlp:
90112
tracing:
91113
endpoint: ${owms.tracing.url}
92-
prometheus:
93-
metrics:
94-
export:
95-
enabled: true
96-
server:
97-
port: ${MGMTPORT:8990}
98114
tracing:
99115
sampling:
100116
probability: 1.0

0 commit comments

Comments
 (0)