Skip to content

Commit f8abaf3

Browse files
committed
update interdependencies on hex packages
1 parent 01acad7 commit f8abaf3

File tree

6 files changed

+24
-26
lines changed

6 files changed

+24
-26
lines changed

apps/opentelemetry_api_experimental/mix.exs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,7 @@ defmodule OpenTelemetryExperimental.MixProject do
1818
# source_url: "https://github.com/USER/PROJECT",
1919
# homepage_url: "http://YOUR_PROJECT_HOMEPAGE",
2020
test_coverage: [tool: :covertool],
21-
docs: [
22-
markdown_processor: ExDoc.Markdown.Cmark,
23-
main: "OpenTelemetryAPIExperimental",
24-
# logo: "path/to/logo.png",
25-
extras: erlang_docs()
26-
],
27-
aliases: [
28-
# when build docs first build edocs with rebar3
29-
docs: ["cmd rebar3 edoc", "docs"]
30-
],
21+
aliases: [docs: & &1],
3122
package: package()
3223
]
3324
end
@@ -72,15 +63,6 @@ defmodule OpenTelemetryExperimental.MixProject do
7263
]
7364
end
7465

75-
def erlang_docs() do
76-
files =
77-
for file <- Path.wildcard("edoc/*.md"),
78-
file != "edoc/README.md",
79-
do: {String.to_atom(file), [title: Path.basename(file, ".md")]}
80-
81-
[{:"README.md", [title: "Overview"]} | files]
82-
end
83-
8466
defp load_config do
8567
{:ok, config} = :file.consult('rebar.config')
8668

apps/opentelemetry_api_experimental/mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
1212
"makeup_erlang": {:hex, :makeup_erlang, "0.1.3", "d684f4bac8690e70b06eb52dad65d26de2eefa44cd19d64a8095e1417df7c8fd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9"},
1313
"nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
14-
"opentelemetry_api": {:hex, :opentelemetry_api, "1.2.2", "693f47b0d8c76da2095fe858204cfd6350c27fe85d00e4b763deecc9588cf27a", [:mix, :rebar3], [{:opentelemetry_semantic_conventions, "~> 0.2", [hex: :opentelemetry_semantic_conventions, repo: "hexpm", optional: false]}], "hexpm", "dc77b9a00f137a858e60a852f14007bb66eda1ffbeb6c05d5fe6c9e678b05e9d"},
14+
"opentelemetry_api": {:hex, :opentelemetry_api, "1.3.0", "03e2177f28dd8d11aaa88e8522c81c2f6a788170fe52f7a65262340961e663f9", [:mix, :rebar3], [{:opentelemetry_semantic_conventions, "~> 0.2", [hex: :opentelemetry_semantic_conventions, repo: "hexpm", optional: false]}], "hexpm", "b9e5ff775fd064fa098dba3c398490b77649a352b40b0b730a6b7dc0bdd68858"},
1515
"opentelemetry_semantic_conventions": {:hex, :opentelemetry_semantic_conventions, "0.2.0", "b67fe459c2938fcab341cb0951c44860c62347c005ace1b50f8402576f241435", [:mix, :rebar3], [], "hexpm", "d61fa1f5639ee8668d74b527e6806e0503efc55a42db7b5f39939d84c07d6895"},
1616
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{erl_opts, [debug_info]}.
2-
{deps, [{opentelemetry_api, "~> 1.2"}]}.
2+
{deps, [{opentelemetry_api, "~> 1.3"}]}.

apps/opentelemetry_experimental/rebar.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{erl_opts, [debug_info]}.
2-
{deps, [{opentelemetry, "~> 1.3"},
3-
{opentelemetry_api, "~> 1.2"},
4-
{opentelemetry_api_experimental, "~> 0.4"}]}.
2+
{deps, [{opentelemetry, "~> 1.4"},
3+
{opentelemetry_api, "~> 1.3"},
4+
{opentelemetry_api_experimental, "~> 0.5"}]}.
55

66
{shell, [
77
% {config, "config/sys.config"},

apps/opentelemetry_exporter/rebar.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{erl_opts, [debug_info]}.
22
{deps, [{grpcbox, ">= 0.0.0"},
33
{tls_certificate_check, "~> 1.18"},
4-
{opentelemetry, "~> 1.3.1"},
5-
{opentelemetry_api, "~> 1.2.2"}]}.
4+
{opentelemetry, "~> 1.4.0"},
5+
{opentelemetry_api, "~> 1.3.0"}]}.
66

77
{grpc, [{protos, ["opentelemetry-proto/opentelemetry/proto/collector/trace/v1",
88
"opentelemetry-proto/opentelemetry/proto/collector/metrics/v1",

docs.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ rebar3 compile
1111
rebar3 edoc
1212
sdk_version=1.4.0
1313
api_version=1.3.0
14+
exp_sdk_version=0.5.0
15+
exp_api_version=0.5.0
1416
otlp_version=1.7.0
1517
zipkin_version=1.1.0
1618
semconv_version=0.2.0
@@ -20,6 +22,11 @@ ex_doc "opentelemetry" $sdk_version "_build/default/lib/opentelemetry/ebin" \
2022
--config apps/opentelemetry/docs.config $@ \
2123
--output "apps/opentelemetry/doc"
2224

25+
ex_doc "opentelemetry_experimental" $exp_sdk_version "_build/default/lib/opentelemetry_experimental/ebin" \
26+
--source-ref v${exp_sdk_version} \
27+
--config apps/opentelemetry_experimental/docs.config $@ \
28+
--output "apps/opentelemetry_experimental/doc"
29+
2330
ex_doc "opentelemetry_exporter" $otlp_version "_build/default/lib/opentelemetry_exporter/ebin" \
2431
--source-ref v${otlp_version} \
2532
--config apps/opentelemetry_exporter/docs.config $@ \
@@ -39,6 +46,15 @@ ex_doc "opentelemetry_api" $api_version "apps/opentelemetry_api/_build/dev/lib/o
3946
--config apps/opentelemetry_api/docs.config $@ \
4047
--output "apps/opentelemetry_api/doc"
4148

49+
pushd apps/opentelemetry_api_experimental
50+
mix deps.get
51+
mix compile
52+
popd
53+
ex_doc "opentelemetry_api_experimental" $api_version "apps/opentelemetry_api_experimental/_build/dev/lib/opentelemetry_api_experimental/ebin" \
54+
--source-ref v${exp_api_version} \
55+
--config apps/opentelemetry_api_experimental/docs.config $@ \
56+
--output "apps/opentelemetry_api_experimental/doc"
57+
4258
pushd apps/opentelemetry_semantic_conventions/
4359
mix deps.get
4460
mix compile

0 commit comments

Comments
 (0)