Skip to content

Commit 86e0798

Browse files
committed
[WFLY-19535] Sync WildFly and Quickstarts version of Otel Collector
Update OpenTelemetry Collector image version Modify receiver configs to reflect collector changes Modify exporter configs to reflect collector changes Modify opentelemetry WildFly config to prevent unwanted span drops Add opentelemetry metrics and log configs to prevent unwanted server log errors
1 parent 30e68e6 commit 86e0798

8 files changed

+38
-16
lines changed

micrometer/charts/opentelemetry-collector-kubernetes.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ data:
99
otlp:
1010
protocols:
1111
grpc:
12+
endpoint: "0.0.0.0:4317"
1213
http:
14+
endpoint: "0.0.0.0:4318"
1315
processors:
1416
exporters:
15-
logging:
17+
debug:
1618
verbosity: detailed
1719
prometheus:
1820
endpoint: "0.0.0.0:1234"
@@ -21,7 +23,7 @@ data:
2123
metrics:
2224
receivers: [otlp]
2325
processors: []
24-
exporters: [logging,prometheus]
26+
exporters: [debug,prometheus]
2527
---
2628
apiVersion: apps/v1
2729
kind: Deployment
@@ -41,7 +43,7 @@ spec:
4143
- name: otelcol
4244
args:
4345
- --config=/conf/collector.yml
44-
image: otel/opentelemetry-collector:0.89.0
46+
image: otel/opentelemetry-collector:0.115.1
4547
volumeMounts:
4648
- mountPath: /conf
4749
name: collector-config

micrometer/charts/opentelemetry-collector-openshift.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ data:
99
otlp:
1010
protocols:
1111
grpc:
12+
endpoint: "0.0.0.0:4317"
1213
http:
14+
endpoint: "0.0.0.0:4318"
1315
processors:
1416
exporters:
15-
logging:
17+
debug:
1618
verbosity: detailed
1719
prometheus:
1820
endpoint: "0.0.0.0:1234"
@@ -21,7 +23,7 @@ data:
2123
metrics:
2224
receivers: [otlp]
2325
processors: []
24-
exporters: [logging,prometheus]
26+
exporters: [debug,prometheus]
2527
---
2628
apiVersion: apps/v1
2729
kind: Deployment
@@ -41,7 +43,7 @@ spec:
4143
- name: otelcol
4244
args:
4345
- --config=/conf/collector.yml
44-
image: otel/opentelemetry-collector:0.89.0
46+
image: otel/opentelemetry-collector:0.115.1
4547
volumeMounts:
4648
- mountPath: /conf
4749
name: collector-config

micrometer/docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22

33
services:
44
otel-collector:
5-
image: otel/opentelemetry-collector:0.89.0
5+
image: otel/opentelemetry-collector:0.115.1
66
command: [--config=/etc/otel-collector-config.yaml]
77
volumes:
88
- ./otel-collector-config.yaml:/etc/otel-collector-config.yaml:Z

micrometer/otel-collector-config.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@ receivers:
99
otlp:
1010
protocols:
1111
grpc:
12+
endpoint: "0.0.0.0:4317"
1213
http:
14+
endpoint: "0.0.0.0:4318"
1315

1416
processors:
1517
batch:
1618

1719
exporters:
20+
debug:
21+
verbosity: detailed
1822
prometheus:
1923
endpoint: "0.0.0.0:1234"
2024

@@ -23,7 +27,7 @@ service:
2327
metrics:
2428
receivers: [otlp]
2529
processors: [batch]
26-
exporters: [prometheus]
30+
exporters: [debug,prometheus]
2731

2832
extensions: [health_check, pprof, zpages]
2933

opentelemetry-tracing/charts/opentelemetry-collector-kubernetes.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@ data:
99
otlp:
1010
protocols:
1111
grpc:
12+
endpoint: "0.0.0.0:4317"
1213
http:
14+
endpoint: "0.0.0.0:4318"
1315
processors:
1416
exporters:
15-
logging:
17+
debug:
1618
verbosity: detailed
1719
service:
1820
pipelines:
1921
traces:
2022
receivers: [otlp]
2123
processors: []
22-
exporters: [logging]
24+
exporters: [debug]
2325
---
2426
apiVersion: apps/v1
2527
kind: Deployment

opentelemetry-tracing/charts/opentelemetry-collector-openshift.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@ data:
99
otlp:
1010
protocols:
1111
grpc:
12+
endpoint: "0.0.0.0:4317"
1213
http:
14+
endpoint: "0.0.0.0:4318"
1315
processors:
1416
exporters:
15-
logging:
17+
debug:
1618
verbosity: detailed
1719
service:
1820
pipelines:
1921
traces:
2022
receivers: [otlp]
2123
processors: []
22-
exporters: [logging]
24+
exporters: [debug]
2325
---
2426
apiVersion: apps/v1
2527
kind: Deployment

opentelemetry-tracing/configure-opentelemetry.cli

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ end-if
77
/subsystem=opentelemetry:write-attribute(name=endpoint,value=http://${OTEL_COLLECTOR_HOST:localhost}:4317)
88
/subsystem=opentelemetry:write-attribute(name=exporter-type,value=otlp)
99
/subsystem=opentelemetry:write-attribute(name=sampler-type,value=on)
10-
/subsystem=opentelemetry:write-attribute(name=max-queue-size,value=1)
1110
/subsystem=opentelemetry:write-attribute(name=max-export-batch-size,value=512)

opentelemetry-tracing/otel-collector-config.yaml

+14-3
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,32 @@ receivers:
99
otlp:
1010
protocols:
1111
grpc:
12+
endpoint: "0.0.0.0:4317"
1213
http:
14+
endpoint: "0.0.0.0:4318"
1315

1416
processors:
1517
batch:
1618

1719
exporters:
18-
logging:
20+
debug:
1921
verbosity: detailed
20-
22+
prometheus:
23+
endpoint: "0.0.0.0:1234"
2124
service:
2225
pipelines:
2326
traces:
2427
receivers: [otlp]
2528
processors: []
26-
exporters: [logging]
29+
exporters: [debug]
30+
metrics:
31+
receivers: [ otlp ]
32+
processors: [ batch ]
33+
exporters: [ debug, prometheus ]
34+
logs:
35+
receivers: [ otlp ]
36+
processors: [ batch ]
37+
exporters: [ debug ]
2738

2839
extensions: [health_check, pprof, zpages]
2940

0 commit comments

Comments
 (0)