Skip to content

Commit b37106b

Browse files
authored
Tracing updates (#807)
1 parent 6df3df7 commit b37106b

File tree

7 files changed

+53
-42
lines changed

7 files changed

+53
-42
lines changed

cloudbank-v32/account/src/main/resources/application.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,13 @@ management:
7979
zipkin:
8080
tracing:
8181
endpoint: http://jaegertracing-collector.observability:9411/api/v2/spans
82-
otlp:
83-
tracing:
84-
endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
82+
# otlp:
83+
# tracing:
84+
# endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
85+
8586
logging:
8687
level:
8788
root: INFO
88-
com.example: DEBUG
89+
com.example: INFO
90+
pattern:
91+
level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]'

cloudbank-v32/checks/src/main/resources/application.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@ management:
4545
zipkin:
4646
tracing:
4747
endpoint: http://jaegertracing-collector.observability:9411/api/v2/spans
48-
otlp:
49-
tracing:
50-
endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
48+
# otlp:
49+
# tracing:
50+
# endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
5151

5252
logging:
5353
level:
5454
root: INFO
55-
com.example: DEBUG
55+
com.example: INFO
56+
pattern:
57+
level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]'

cloudbank-v32/creditscore/src/main/resources/application.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,15 @@ management:
4747
zipkin:
4848
tracing:
4949
endpoint: http://jaegertracing-collector.observability:9411/api/v2/spans
50-
otlp:
51-
tracing:
52-
endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
50+
# otlp:
51+
# tracing:
52+
# endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
53+
# endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4318/v1/traces
54+
# endpoint: open-telemetry-opentelemetry-collector.open-telemetry:4317
55+
# endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317/v1/traces
5356
logging:
5457
level:
5558
root: INFO
56-
com.example: DEBUG
59+
com.example: INFO
60+
pattern:
61+
level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]'

cloudbank-v32/customer/src/main/resources/application.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,13 @@ management:
6868
zipkin:
6969
tracing:
7070
endpoint: http://jaegertracing-collector.observability:9411/api/v2/spans
71-
otlp:
72-
tracing:
73-
endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
71+
# otlp:
72+
# tracing:
73+
# endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
74+
7475
logging:
7576
level:
7677
root: INFO
77-
com.example: DEBUG
78+
com.example: INFO
79+
pattern:
80+
level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]'

cloudbank-v32/pom.xml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,18 @@
5656
<groupId>io.micrometer</groupId>
5757
<artifactId>micrometer-registry-prometheus</artifactId>
5858
</dependency>
59-
<dependency>
60-
<groupId>io.micrometer</groupId>
61-
<artifactId>micrometer-tracing</artifactId>
62-
</dependency>
63-
64-
<dependency>
65-
<groupId>io.opentelemetry</groupId>
66-
<artifactId>opentelemetry-exporter-otlp</artifactId>
67-
</dependency>
68-
59+
<!-- <dependency>-->
60+
<!-- <groupId>io.micrometer</groupId>-->
61+
<!-- <artifactId>micrometer-tracing-bridge-otel</artifactId>-->
62+
<!-- </dependency>-->
63+
<!-- <dependency>-->
64+
<!-- <groupId>io.opentelemetry</groupId>-->
65+
<!-- <artifactId>opentelemetry-exporter-otlp</artifactId>-->
66+
<!-- </dependency>-->
67+
<!-- <dependency>-->
68+
<!-- <groupId>io.micrometer</groupId>-->
69+
<!-- <artifactId>micrometer-tracing</artifactId>-->
70+
<!-- </dependency>-->
6971
<dependency>
7072
<groupId>io.micrometer</groupId>
7173
<artifactId>micrometer-tracing-bridge-brave</artifactId>
@@ -74,14 +76,6 @@
7476
<groupId>io.zipkin.reporter2</groupId>
7577
<artifactId>zipkin-reporter-brave</artifactId>
7678
</dependency>
77-
78-
<!-- The Datasource Micrometer provides a Micrometer Tracing instrumentation for JDBC operations -->
79-
<!-- <dependency>-->
80-
<!-- <groupId>net.ttddyy.observation</groupId>-->
81-
<!-- <artifactId>datasource-micrometer-spring-boot</artifactId>-->
82-
<!-- <version>1.0.2</version>-->
83-
<!-- </dependency>-->
84-
8579
<dependency>
8680
<groupId>org.springframework.cloud</groupId>
8781
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>

cloudbank-v32/testrunner/src/main/resources/application.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@ management:
4545
zipkin:
4646
tracing:
4747
endpoint: http://jaegertracing-collector.observability:9411/api/v2/spans
48-
otlp:
49-
tracing:
50-
endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
48+
# otlp:
49+
# tracing:
50+
# endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
5151

5252
logging:
5353
level:
5454
root: INFO
55-
com.example: DEBUG
55+
com.example: INFO
56+
pattern:
57+
level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]'

cloudbank-v32/transfer/src/main/resources/application.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,13 @@ management:
7171
zipkin:
7272
tracing:
7373
endpoint: http://jaegertracing-collector.observability:9411/api/v2/spans
74-
otlp:
75-
tracing:
76-
endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
74+
# otlp:
75+
# tracing:
76+
# endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
7777

7878
logging:
7979
level:
8080
root: INFO
81-
com.example: DEBUG
81+
com.example: INFO
82+
pattern:
83+
level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]'

0 commit comments

Comments
 (0)