Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/logfiles
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/ch/usi/si/seart/config/ActuatorConfig.java
  • Loading branch information
dabico committed Jan 24, 2024
2 parents 240dd18 + ea1f2a0 commit 9cd1302
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/main/java/ch/usi/si/seart/config/ActuatorConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.actuate.info.InfoContributor;
import org.springframework.boot.actuate.logging.LogFileWebEndpoint;
import org.springframework.boot.actuate.trace.http.HttpTraceRepository;
import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -18,6 +20,11 @@
@Configuration
public class ActuatorConfig {

@Bean
public HttpTraceRepository httpTraceRepository() {
return new InMemoryHttpTraceRepository();
}

@Bean("gitHubApi")
public HealthIndicator gitHubApiHealthIndicator() {
return new GitHubAPIHealthIndicator();
Expand Down
10 changes: 10 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ management.endpoint.health.group.details.include=*
management.endpoint.health.group.details.show-details=when_authorized
management.endpoint.health.group.details.show-components=when_authorized

# Trace Configuration
management.trace.http.include[0]=principal
management.trace.http.include[1]=session-id
management.trace.http.include[2]=authorization-header
management.trace.http.include[3]=request_headers
management.trace.http.include[4]=response-headers
management.trace.http.include[5]=cookie-headers
management.trace.http.include[6]=time-taken
management.trace.http.include[7]=remote-address

# Info Configuration
management.info.os.enabled=true
management.info.java.enabled=true
Expand Down

0 comments on commit 9cd1302

Please sign in to comment.