Merge pull request #349 from indrekj/fix-metrics-exporter

Fix using OTEL_METRICS_EXPORTER env variable

Author: tsloughter

apps/opentelemetry/src/otel_configuration.erl

@@ -35,7 +35,8 @@
                resource_detectors => [module()],
                resource_detector_timeout => integer(),
                text_map_propagators := [atom()],
-               traces_exporter := {atom(), term()},
+               traces_exporter := {atom(), term()} | undefined,
+               metrics_exporter := {atom(), term()} | undefined,
                processors := list(),
                sampler := {atom(), term()},
                sweeper := #{interval => integer() | infinity,
@@ -61,6 +62,7 @@ new() ->
       resource_detector_timeout => 5000,
       text_map_propagators => [trace_context, baggage],
       traces_exporter => {opentelemetry_exporter, #{}},
+      metrics_exporter => {opentelemetry_exporter, #{}},
       processors => [{otel_batch_processor, #{scheduled_delay_ms => 5000,
                                               exporting_timeout_ms => 30000,
                                               max_queue_size => 2048,

apps/opentelemetry/test/otel_configuration_SUITE.erl

@@ -19,8 +19,9 @@ all() ->
     [empty_os_environment, sampler, sampler_parent_based, sampler_parent_based_zero,
      sampler_trace_id, sampler_trace_id_default, sampler_parent_based_one,
      log_level, propagators, propagators_b3, propagators_b3multi, otlp_exporter,
-     jaeger_exporter, zipkin_exporter, none_exporter, span_limits, bad_span_limits,
-     bad_app_config, app_env_exporter, deny_list, resource_detectors].
+     jaeger_exporter, zipkin_exporter, none_exporter, app_env_exporter,
+     otlp_metrics_exporter, none_metrics_exporter, span_limits, bad_span_limits,
+     bad_app_config, deny_list, resource_detectors].
 
 init_per_testcase(empty_os_environment, Config) ->
     Vars = [],
@@ -112,6 +113,19 @@ init_per_testcase(none_exporter, Config) ->
 
     setup_env(Vars),
 
+    [{os_vars, Vars} | Config];
+
+init_per_testcase(otlp_metrics_exporter, Config) ->
+    Vars = [{"OTEL_METRICS_EXPORTER", "otlp"}],
+
+    setup_env(Vars),
+
+    [{os_vars, Vars} | Config];
+init_per_testcase(none_metrics_exporter, Config) ->
+    Vars = [{"OTEL_METRICS_EXPORTER", "none"}],
+
+    setup_env(Vars),
+
     [{os_vars, Vars} | Config];
 init_per_testcase(deny_list, Config) ->
     Vars = [{"OTEL_DENY_LIST", "opentelemetry_exporter,opentelemetry,nonexisting_atom"}],
@@ -283,6 +297,18 @@ app_env_exporter(_Config) ->
 
     ok.
 
+otlp_metrics_exporter(_Config) ->
+    ?assertMatch({opentelemetry_exporter, #{}},
+                 maps:get(metrics_exporter, otel_configuration:merge_with_os([]))),
+
+    ok.
+
+none_metrics_exporter(_Config) ->
+    ?assertMatch(undefined,
+                 maps:get(metrics_exporter, otel_configuration:merge_with_os([]))),
+
+    ok.
+
 deny_list(_Config) ->
     %% nonexisting_atom in the OTEL_DENY_LIST os var is dropped bc it isn't an existing atom
     ?assertMatch(#{deny_list := [opentelemetry_exporter,opentelemetry]},