Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api-catalog-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CATALOG_CODE} ${JAVA_BIN_DIR}java \
-Dloader.path=${COMMON_LIB} \
-Djava.library.path=${LIBPATH} \
-Djavax.net.debug=${ZWE_configs_sslDebug:-""} \
-Dotel.sdk.disabled=true \
-jar "${JAR_FILE}" &
pid=$!
echo "pid=${pid}"
Expand Down
4 changes: 4 additions & 0 deletions api-catalog-services/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ spring:
profiles.group:
dev: debug, diag

otel:
sdk:
disabled: true

springdoc:
packagesToScan: org.zowe.apiml.apicatalog.controllers.api
api-docs:
Expand Down
1 change: 1 addition & 0 deletions apiml/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ dependencies {
implementation libs.nimbus.jose.jwt
implementation libs.spring.doc.webflux.ui
implementation libs.jose4j.jwt // Signing, with support for JCA with ICSF
implementation libs.opentelemetry.spring.boot.starter

testImplementation(testFixtures(project(":apiml-common")))
testImplementation(testFixtures(project(":gateway-service")))
Expand Down
5 changes: 5 additions & 0 deletions apiml/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ spring:
web-application-type: reactive
allow-bean-definition-overriding: true

otel:
sdk:
disabled: true

springdoc:
api-docs:
path: /v3/api-docs
Expand Down Expand Up @@ -319,6 +323,7 @@ management:
base-path: /application
exposure:
include: health,info

---
spring.config.activate.on-profile: debug

Expand Down
1 change: 1 addition & 0 deletions caching-service-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \
-Djava.net.preferIPv4Stack=true \
-Djavax.net.debug=${ZWE_configs_sslDebug:-""} \
-Djava.library.path=${LIBPATH} \
-Dotel.sdk.disabled=true \
-jar "${JAR_FILE}" &
pid=$!
echo "pid=${pid}"
Expand Down
5 changes: 5 additions & 0 deletions caching-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@ spring:
banner-mode: ${apiml.banner:"off"}
web-application-type: reactive
allow-bean-definition-overriding: true

otel:
sdk:
disabled: true

springdoc:
pathsToMatch: /api/v1/**
api-docs:
Expand Down
1 change: 1 addition & 0 deletions discovery-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${DISCOVERY_CODE} ${JAVA_BIN_DIR}java \
-Dserver.ssl.trustStorePassword="${truststore_pass}" \
-Dserver.ssl.trustStoreType="${truststore_type}" \
-Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
-Dotel.sdk.disabled=true \
-jar "${JAR_FILE}" &
pid=$!
echo "pid=${pid}"
Expand Down
4 changes: 4 additions & 0 deletions discovery-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ spring:
profiles.group:
dev: debug, diag

otel:
sdk:
disabled: true

server:
address: ${apiml.service.ipAddress}
port: ${apiml.service.port}
Expand Down
1 change: 1 addition & 0 deletions gateway-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \
-Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
-Dapiml.security.rauditx.onOidcUserIsMapped=${ZWE_configs_apiml_security_rauditx_onOidcUserIsMapped:-false} \
-Dapiml.security.rauditx.oidcSourceUserPaths=${ZWE_configs_apiml_security_rauditx_oidcSourceUserPaths:-sub} \
-Dotel.sdk.disabled=true \
-jar "${JAR_FILE}" &

pid=$!
Expand Down
4 changes: 4 additions & 0 deletions gateway-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ spring:
banner-mode: ${apiml.banner:"off"}
web-application-type: reactive

otel:
sdk:
disabled: true

springdoc:
api-docs:
path: /gateway/api-docs
Expand Down
2 changes: 2 additions & 0 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ dependencyResolutionManagement {
version('jakartaInject', '2.0.1')
version('jakartaServlet', '6.1.0')
version('javaxAnnotation', '1.3.2')
version('openTelemetry-starter', '2.20.1')

// Eureka requires this specific version of Jakarta JAXB bindings
version('jaxbApi') {
Expand Down Expand Up @@ -248,6 +249,7 @@ dependencyResolutionManagement {
library('spring_boot_starter_graphql', 'org.springframework.boot', 'spring-boot-starter-graphql').versionRef('springBootGraphQl')
library('bucket4j_core', 'com.bucket4j', 'bucket4j_jdk17-core').versionRef('bucket4j')
library('xstren', 'com.thoughtworks.xstream', 'xstream').versionRef('xstream') // to avoid security vulnerability CVE-2024-47072
library('opentelemetry_spring_boot_starter', 'io.opentelemetry.instrumentation','opentelemetry-spring-boot-starter').versionRef('openTelemetry-starter')

// Sample apps only
library('jersey_client4', 'com.sun.jersey.contribs', 'jersey-apache-client4').versionRef('jerseySun')
Expand Down
1 change: 1 addition & 0 deletions zaas-package/src/main/resources/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \
-Dloader.path=${ZAAS_LOADER_PATH} \
-Djava.library.path=${LIBPATH} \
-Djavax.net.debug=${ZWE_configs_sslDebug:-""} \
-Dotel.sdk.disabled=true \
-jar ${JAR_FILE} &

pid=$!
Expand Down
4 changes: 4 additions & 0 deletions zaas-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ spring:
allow-circular-references: true
web-application-type: servlet

otel:
sdk:
disabled: true

springdoc:
writer-with-order-by-keys: true

Expand Down
Loading