Merge pull request #1000 from jasondlee/WFLY-19535

[WFLY-19535] Sync WildFly and Quickstarts version of Otel Collector
wildfly · Jan 9, 2025 · d5bdf67 · d5bdf67
2 parents 5267c86 + 86e0798
commit d5bdf67
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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]