From 86e0798e0f3a1e0010b974ed493df0a575e15fcc Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Mon, 6 Jan 2025 11:48:50 -0600 Subject: [PATCH] [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 --- .../opentelemetry-collector-kubernetes.yaml | 8 +++++--- .../opentelemetry-collector-openshift.yaml | 8 +++++--- micrometer/docker-compose.yaml | 2 +- micrometer/otel-collector-config.yaml | 6 +++++- .../opentelemetry-collector-kubernetes.yaml | 6 ++++-- .../opentelemetry-collector-openshift.yaml | 6 ++++-- .../configure-opentelemetry.cli | 1 - .../otel-collector-config.yaml | 17 ++++++++++++++--- 8 files changed, 38 insertions(+), 16 deletions(-) diff --git a/micrometer/charts/opentelemetry-collector-kubernetes.yaml b/micrometer/charts/opentelemetry-collector-kubernetes.yaml index 48a7b7e977..0f573f6662 100644 --- a/micrometer/charts/opentelemetry-collector-kubernetes.yaml +++ b/micrometer/charts/opentelemetry-collector-kubernetes.yaml @@ -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" @@ -21,7 +23,7 @@ data: metrics: receivers: [otlp] processors: [] - exporters: [logging,prometheus] + exporters: [debug,prometheus] --- apiVersion: apps/v1 kind: Deployment @@ -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 diff --git a/micrometer/charts/opentelemetry-collector-openshift.yaml b/micrometer/charts/opentelemetry-collector-openshift.yaml index 948c93738c..16eb74b5c3 100644 --- a/micrometer/charts/opentelemetry-collector-openshift.yaml +++ b/micrometer/charts/opentelemetry-collector-openshift.yaml @@ -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" @@ -21,7 +23,7 @@ data: metrics: receivers: [otlp] processors: [] - exporters: [logging,prometheus] + exporters: [debug,prometheus] --- apiVersion: apps/v1 kind: Deployment @@ -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 diff --git a/micrometer/docker-compose.yaml b/micrometer/docker-compose.yaml index eec595bc93..3a8d5bd7f8 100644 --- a/micrometer/docker-compose.yaml +++ b/micrometer/docker-compose.yaml @@ -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 diff --git a/micrometer/otel-collector-config.yaml b/micrometer/otel-collector-config.yaml index aa603ad2e6..983c5eed8a 100644 --- a/micrometer/otel-collector-config.yaml +++ b/micrometer/otel-collector-config.yaml @@ -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" @@ -23,7 +27,7 @@ service: metrics: receivers: [otlp] processors: [batch] - exporters: [prometheus] + exporters: [debug,prometheus] extensions: [health_check, pprof, zpages] diff --git a/opentelemetry-tracing/charts/opentelemetry-collector-kubernetes.yaml b/opentelemetry-tracing/charts/opentelemetry-collector-kubernetes.yaml index 476e642241..7a0f8d20ec 100644 --- a/opentelemetry-tracing/charts/opentelemetry-collector-kubernetes.yaml +++ b/opentelemetry-tracing/charts/opentelemetry-collector-kubernetes.yaml @@ -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 diff --git a/opentelemetry-tracing/charts/opentelemetry-collector-openshift.yaml b/opentelemetry-tracing/charts/opentelemetry-collector-openshift.yaml index e31a42b4d8..ec458b0ef7 100644 --- a/opentelemetry-tracing/charts/opentelemetry-collector-openshift.yaml +++ b/opentelemetry-tracing/charts/opentelemetry-collector-openshift.yaml @@ -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 diff --git a/opentelemetry-tracing/configure-opentelemetry.cli b/opentelemetry-tracing/configure-opentelemetry.cli index 72b05c0376..d6ebc48adc 100644 --- a/opentelemetry-tracing/configure-opentelemetry.cli +++ b/opentelemetry-tracing/configure-opentelemetry.cli @@ -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) diff --git a/opentelemetry-tracing/otel-collector-config.yaml b/opentelemetry-tracing/otel-collector-config.yaml index cf267458b7..34e99a0447 100644 --- a/opentelemetry-tracing/otel-collector-config.yaml +++ b/opentelemetry-tracing/otel-collector-config.yaml @@ -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]