Skip to content

Commit

Permalink
[WFLY-19535] Sync WildFly and Quickstarts version of Otel Collector
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jasondlee committed Jan 6, 2025
1 parent 30e68e6 commit 86e0798
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 16 deletions.
8 changes: 5 additions & 3 deletions micrometer/charts/opentelemetry-collector-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ data:
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
http:
endpoint: "0.0.0.0:4318"
processors:
exporters:
logging:
debug:
verbosity: detailed
prometheus:
endpoint: "0.0.0.0:1234"
Expand All @@ -21,7 +23,7 @@ data:
metrics:
receivers: [otlp]
processors: []
exporters: [logging,prometheus]
exporters: [debug,prometheus]
---
apiVersion: apps/v1
kind: Deployment
Expand All @@ -41,7 +43,7 @@ spec:
- name: otelcol
args:
- --config=/conf/collector.yml
image: otel/opentelemetry-collector:0.89.0
image: otel/opentelemetry-collector:0.115.1
volumeMounts:
- mountPath: /conf
name: collector-config
Expand Down
8 changes: 5 additions & 3 deletions micrometer/charts/opentelemetry-collector-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ data:
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
http:
endpoint: "0.0.0.0:4318"
processors:
exporters:
logging:
debug:
verbosity: detailed
prometheus:
endpoint: "0.0.0.0:1234"
Expand All @@ -21,7 +23,7 @@ data:
metrics:
receivers: [otlp]
processors: []
exporters: [logging,prometheus]
exporters: [debug,prometheus]
---
apiVersion: apps/v1
kind: Deployment
Expand All @@ -41,7 +43,7 @@ spec:
- name: otelcol
args:
- --config=/conf/collector.yml
image: otel/opentelemetry-collector:0.89.0
image: otel/opentelemetry-collector:0.115.1
volumeMounts:
- mountPath: /conf
name: collector-config
Expand Down
2 changes: 1 addition & 1 deletion micrometer/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3"

services:
otel-collector:
image: otel/opentelemetry-collector:0.89.0
image: otel/opentelemetry-collector:0.115.1
command: [--config=/etc/otel-collector-config.yaml]
volumes:
- ./otel-collector-config.yaml:/etc/otel-collector-config.yaml:Z
Expand Down
6 changes: 5 additions & 1 deletion micrometer/otel-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ receivers:
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
http:
endpoint: "0.0.0.0:4318"

processors:
batch:

exporters:
debug:
verbosity: detailed
prometheus:
endpoint: "0.0.0.0:1234"

Expand All @@ -23,7 +27,7 @@ service:
metrics:
receivers: [otlp]
processors: [batch]
exporters: [prometheus]
exporters: [debug,prometheus]

extensions: [health_check, pprof, zpages]

Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ data:
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
http:
endpoint: "0.0.0.0:4318"
processors:
exporters:
logging:
debug:
verbosity: detailed
service:
pipelines:
traces:
receivers: [otlp]
processors: []
exporters: [logging]
exporters: [debug]
---
apiVersion: apps/v1
kind: Deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ data:
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
http:
endpoint: "0.0.0.0:4318"
processors:
exporters:
logging:
debug:
verbosity: detailed
service:
pipelines:
traces:
receivers: [otlp]
processors: []
exporters: [logging]
exporters: [debug]
---
apiVersion: apps/v1
kind: Deployment
Expand Down
1 change: 0 additions & 1 deletion opentelemetry-tracing/configure-opentelemetry.cli
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ end-if
/subsystem=opentelemetry:write-attribute(name=endpoint,value=http://${OTEL_COLLECTOR_HOST:localhost}:4317)
/subsystem=opentelemetry:write-attribute(name=exporter-type,value=otlp)
/subsystem=opentelemetry:write-attribute(name=sampler-type,value=on)
/subsystem=opentelemetry:write-attribute(name=max-queue-size,value=1)
/subsystem=opentelemetry:write-attribute(name=max-export-batch-size,value=512)
17 changes: 14 additions & 3 deletions opentelemetry-tracing/otel-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,32 @@ receivers:
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
http:
endpoint: "0.0.0.0:4318"

processors:
batch:

exporters:
logging:
debug:
verbosity: detailed

prometheus:
endpoint: "0.0.0.0:1234"
service:
pipelines:
traces:
receivers: [otlp]
processors: []
exporters: [logging]
exporters: [debug]
metrics:
receivers: [ otlp ]
processors: [ batch ]
exporters: [ debug, prometheus ]
logs:
receivers: [ otlp ]
processors: [ batch ]
exporters: [ debug ]

extensions: [health_check, pprof, zpages]

0 comments on commit 86e0798

Please sign in to comment.