Skip to content

Commit

Permalink
Merge branch 'main' into sem-con-1.25
Browse files Browse the repository at this point in the history
  • Loading branch information
bryannaegele authored Sep 23, 2024
2 parents 69b41af + 0325c19 commit 056e156
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions apps/opentelemetry/src/otel_exporter.erl
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ init({ExporterModule, Config}) when is_atom(ExporterModule) ->
end;
{error, undef} when ExporterModule =:= opentelemetry_exporter ->
?LOG_WARNING("OTLP exporter module `opentelemetry_exporter` not found. "
"Verify you have included the `opentelemetry_exporter` dependency.",
[ExporterModule]),
"Verify you have included the `opentelemetry_exporter` dependency."),
undefined;
{error, undef} ->
?LOG_WARNING("Exporter module ~tp not found. Verify you have included "
Expand Down
4 changes: 2 additions & 2 deletions apps/opentelemetry_api_experimental/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ defmodule OpenTelemetryExperimental.MixProject do
end

defp load_config do
{:ok, config} = :file.consult('rebar.config')
{:ok, config} = :file.consult(~c"rebar.config")

config
end

defp load_app do
{:ok, [{:application, name, desc}]} =
:file.consult('src/opentelemetry_api_experimental.app.src')
:file.consult(~c"src/opentelemetry_api_experimental.app.src")

{name, desc}
end
Expand Down

0 comments on commit 056e156

Please sign in to comment.