Skip to content

Commit

Permalink
Merge pull request #2357 from amvanbaren/tracing-cleanup
Browse files Browse the repository at this point in the history
Monitoring and tracing cleanup
  • Loading branch information
amvanbaren committed Feb 15, 2024
2 parents 8a4941f + d748b39 commit a8f340b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 56 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ RUN /usr/bin/yarn --cwd website \
&& /usr/bin/yarn --cwd website build

# Main image derived from openvsx-server
FROM docker.io/amvanbaren/openvsx-server:fd678d5
FROM ghcr.io/eclipse/openvsx-server:v0.14.3

COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/
COPY --from=builder --chown=openvsx:openvsx /workdir/configuration/ config/
COPY --from=builder --chown=openvsx:openvsx /workdir/logging/logback-spring.xml BOOT-INF/classes/
23 changes: 0 additions & 23 deletions configuration/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
# for database access and ovsx.storage.azure for file storage access.
# Additional properties are loaded from the file provided with the
# DEPLOYMENT_CONFIG environment variable.
logging:
pattern:
level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]'

server:
address: 0.0.0.0
port: 8080
Expand All @@ -16,8 +12,6 @@ server:
mime-types: text/html,text/plain,text/css,application/javascript,application/json,text/xml,application/xml,application/xml+rss,text/javascript
min-response-size: 1024
spring:
application:
name: openvsx-server
config:
import: file:${DEPLOYMENT_CONFIG}
cache:
Expand Down Expand Up @@ -63,15 +57,6 @@ management:
health:
probes:
enabled: true
endpoints:
web:
exposure:
include:
- health
- prometheus
tracing:
sampling:
probability: 1.0
org:
jobrunr:
job-scheduler:
Expand Down Expand Up @@ -163,11 +148,3 @@ ovsx:
seconds: 300
integrity:
key-pair: create
vscode:
upstream:
update-on-start: true
metrics:
prometheus:
params:
exemplars:
enabled: true
31 changes: 0 additions & 31 deletions logging/logback-spring.xml

This file was deleted.

0 comments on commit a8f340b

Please sign in to comment.