Allow metric exporters to be provided as a string (#365)

Signed-off-by: Andrew Crump <[email protected]> Co-authored-by: Carson Long <[email protected]>
cloudfoundry · Aug 16, 2023 · 02b7b52 · 02b7b52
1 parent b1c1005
commit 02b7b52
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/jobs/otel-collector-windows/templates/config.yml.erb b/jobs/otel-collector-windows/templates/config.yml.erb
@@ -1,5 +1,9 @@
 <%=
-if p('metric_exporters').keys.any?{|k| k.include?('/cf-internal')}
+metric_exporters = p('metric_exporters')
+unless metric_exporters.respond_to?(:keys)
+  metric_exporters = YAML::load(metric_exporters)
+end
+if metric_exporters.keys.any?{|k| k.include?('/cf-internal')}
   raise 'Metric exporters cannot be defined under cf-internal namespace'
 end
 
@@ -19,10 +23,10 @@ config = {
       }
     }
   },
-  "exporters"=>p('metric_exporters'),
+  "exporters"=>metric_exporters,
   "service"=>{
     "telemetry"=>{"metrics"=>{"level"=>"none"}},
-    "pipelines"=>{"metrics"=>{"receivers"=>["otlp"], "exporters"=>p('metric_exporters').keys}}
+    "pipelines"=>{"metrics"=>{"receivers"=>["otlp"], "exporters"=>metric_exporters.keys}}
   }
 }
 

diff --git a/jobs/otel-collector/templates/config.yml.erb b/jobs/otel-collector/templates/config.yml.erb
@@ -1,5 +1,9 @@
 <%=
-if p('metric_exporters').keys.any?{|k| k.include?('/cf-internal')}
+metric_exporters = p('metric_exporters')
+unless metric_exporters.respond_to?(:keys)
+  metric_exporters = YAML::load(metric_exporters)
+end
+if metric_exporters.keys.any?{|k| k.include?('/cf-internal')}
   raise 'Metric exporters cannot be defined under cf-internal namespace'
 end
 
@@ -19,10 +23,10 @@ config = {
       }
     }
   },
-  "exporters"=>p('metric_exporters'),
+  "exporters"=>metric_exporters,
   "service"=>{
     "telemetry"=>{"metrics"=>{"level"=>"none"}},
-    "pipelines"=>{"metrics"=>{"receivers"=>["otlp"], "exporters"=>p('metric_exporters').keys}}
+    "pipelines"=>{"metrics"=>{"receivers"=>["otlp"], "exporters"=>metric_exporters.keys}}
   }
 }