marcel/familienarchiv
1
0
Fork 0
Code Issues 105 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(deps): pin opentelemetry-bom to 1.61.0 to fix staging startup crash #596

Merged
marcel merged 2 commits from feat/issue-580-sentry-backend into main 2026-05-15 16:51:19 +02:00
Conversation 7 Commits 2 Files Changed 3 +16 -1
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitea/workflows/ci.yml
View File

@@ -305,6 +305,7 @@ jobs:
MAIL_PORT=1025 MAIL_PORT=1025
APP_MAIL_FROM=noreply@local APP_MAIL_FROM=noreply@local
IMPORT_HOST_DIR=/tmp/dummy-import IMPORT_HOST_DIR=/tmp/dummy-import
COMPOSE_NETWORK_NAME=test-idem-archiv-net
EOF EOF
- name: Bring up minio - name: Bring up minio

14
backend/pom.xml
View File

@@ -29,6 +29,20 @@
<properties> <properties>
<java.version>21</java.version> <java.version>21</java.version>
</properties> </properties>
<dependencyManagement>
<dependencies>
<!-- opentelemetry-spring-boot-starter:2.27.0 was built against opentelemetry-api:1.61.0,
but Spring Boot 4.0.0 BOM only manages 1.55.0 (missing GlobalOpenTelemetry.getOrNoop()).
Import the core OTel BOM here to override it before the Spring Boot BOM applies. -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>1.61.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

2
docker-compose.prod.yml
View File

@@ -39,7 +39,7 @@
networks: networks:
archiv-net: archiv-net:
driver: bridge driver: bridge
name: archiv-net name: ${COMPOSE_NETWORK_NAME:-archiv-net}
volumes: volumes:
postgres-data: postgres-data: