From 90d282fe39e949c884475910800b369b26c85f08 Mon Sep 17 00:00:00 2001 From: Bryan Naegele Date: Tue, 13 Feb 2024 18:09:42 -0700 Subject: [PATCH] Update publishing settings (#285) --- .../opentelemetry_cowboy/CHANGELOG.md | 6 ++++++ .../opentelemetry_cowboy/README.md | 12 ++--------- .../opentelemetry_cowboy/docs.config | 4 ---- instrumentation/opentelemetry_cowboy/docs.sh | 15 -------------- .../opentelemetry_cowboy/rebar.config | 20 +++++++++++-------- .../opentelemetry_cowboy/rebar.lock | 15 ++++++-------- .../src/opentelemetry_cowboy.app.src | 2 +- 7 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 instrumentation/opentelemetry_cowboy/docs.config delete mode 100755 instrumentation/opentelemetry_cowboy/docs.sh diff --git a/instrumentation/opentelemetry_cowboy/CHANGELOG.md b/instrumentation/opentelemetry_cowboy/CHANGELOG.md index b1b3028..9508d0e 100644 --- a/instrumentation/opentelemetry_cowboy/CHANGELOG.md +++ b/instrumentation/opentelemetry_cowboy/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## v0.3.0 + +### Changed + +* Dependency maintenance release + ## v0.2.1 ### Fixes diff --git a/instrumentation/opentelemetry_cowboy/README.md b/instrumentation/opentelemetry_cowboy/README.md index 928451a..035bb86 100644 --- a/instrumentation/opentelemetry_cowboy/README.md +++ b/instrumentation/opentelemetry_cowboy/README.md @@ -21,21 +21,13 @@ There is no additional prerequisite setup for [plug_cowboy](https://hex.pm/packa ```erlang {deps, [ - {opentelemetry_cowboy, "~> 0.2"} + {opentelemetry_cowboy, "~> 0.3"} ]} ``` ```elixir def deps do [ - {:opentelemetry_cowboy, "~> 0.2"} + {:opentelemetry_cowboy, "~> 0.3"} ] end ``` - -## Compatibility Matrix - -| opentelemetry_cowboy Version | Otel Version | Notes | -| :--------------------------- | :------------ | :---- | -| | | | -| v0.1.0 | v.1.0.0-rc.3 | | -| v0.2 | v.1.0 | | diff --git a/instrumentation/opentelemetry_cowboy/docs.config b/instrumentation/opentelemetry_cowboy/docs.config deleted file mode 100644 index b52230e..0000000 --- a/instrumentation/opentelemetry_cowboy/docs.config +++ /dev/null @@ -1,4 +0,0 @@ -{source_url, <<"https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_cowboy">>}. -{extras, [<<"LICENSE">>]}. -{main, <<"opentelemetry_cowboy">>}. -{proglang, erlang}. \ No newline at end of file diff --git a/instrumentation/opentelemetry_cowboy/docs.sh b/instrumentation/opentelemetry_cowboy/docs.sh deleted file mode 100755 index 5c0f735..0000000 --- a/instrumentation/opentelemetry_cowboy/docs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e - -# Setup: -# -# mix escript.install github elixir-lang/ex_doc -# asdf install erlang 24.0.2 -# asdf local erlang 24.0.2 - -rebar3 compile -rebar3 as docs edoc -version=0.1.0 -ex_doc "opentelemetry_cowboy" $version "_build/default/lib/opentelemetry_cowboy/ebin" \ - --source-ref v${version} \ - --config docs.config $@ diff --git a/instrumentation/opentelemetry_cowboy/rebar.config b/instrumentation/opentelemetry_cowboy/rebar.config index 20ab675..4a4784e 100644 --- a/instrumentation/opentelemetry_cowboy/rebar.config +++ b/instrumentation/opentelemetry_cowboy/rebar.config @@ -8,16 +8,20 @@ {project_plugins, [covertool, erlfmt, + rebar3_ex_doc, rebar3_hex]}. + +{hex, [ + {doc, #{provider => ex_doc}} +]}. + +{ex_doc, [ + {source_url, "https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_cowboy"}, + {extras, ["README.md", "LICENSE"]}, + {main, "README.md"}]}. + {profiles, - [{docs, [{deps, [edown]}, - {edoc_opts, - [{preprocess, true}, - {doclet, edoc_doclet_chunks}, - {layout, edoc_layout_chunks}, - {dir, "_build/default/lib/opentelemetry_cowboy/doc"}, - {subpackages, true}]}]}, - {test, [{erl_opts, [nowarn_export_all]}, + [{test, [{erl_opts, [nowarn_export_all]}, {deps, [ {opentelemetry, "~> 1.3"}, {opentelemetry_exporter, "~> 1.6"}, diff --git a/instrumentation/opentelemetry_cowboy/rebar.lock b/instrumentation/opentelemetry_cowboy/rebar.lock index a47ca3e..e7276c5 100644 --- a/instrumentation/opentelemetry_cowboy/rebar.lock +++ b/instrumentation/opentelemetry_cowboy/rebar.lock @@ -7,11 +7,10 @@ {pkg,<<"opentelemetry_semantic_conventions">>,<<"0.2.0">>}, 1}, {<<"opentelemetry_telemetry">>, - {pkg,<<"opentelemetry_telemetry">>,<<"1.0.0">>}, + {pkg,<<"opentelemetry_telemetry">>,<<"1.1.1">>}, 0}, {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},2}, - {<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.2.1">>},0}, - {<<"telemetry_registry">>,{pkg,<<"telemetry_registry">>,<<"0.3.1">>},1}]}. + {<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.2.1">>},0}]}. [ {pkg_hash,[ {<<"cowboy">>, <<"FF9FFEFF91DAE4AE270DD975642997AFE2A1179D94B1887863E43F681A203E26">>}, @@ -19,18 +18,16 @@ {<<"cowlib">>, <<"A9FA9A625F1D2025FE6B462CB865881329B5CAFF8F1854D1CBC9F9533F00E1E1">>}, {<<"opentelemetry_api">>, <<"693F47B0D8C76DA2095FE858204CFD6350C27FE85D00E4B763DEECC9588CF27A">>}, {<<"opentelemetry_semantic_conventions">>, <<"B67FE459C2938FCAB341CB0951C44860C62347C005ACE1B50F8402576F241435">>}, - {<<"opentelemetry_telemetry">>, <<"D5982A319E725FCD2305B306B65C18A86AFDCF7D96821473CF0649FF88877615">>}, + {<<"opentelemetry_telemetry">>, <<"4A73BFA29D7780FFE33DB345465919CEF875034854649C37AC789EB8E8F38B21">>}, {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>}, - {<<"telemetry">>, <<"68FDFE8D8F05A8428483A97D7AAB2F268AAFF24B49E0F599FAA091F1D4E7F61C">>}, - {<<"telemetry_registry">>, <<"14A3319A7D9027BDBFF7EBCACF1A438F5F5C903057B93AEE484CCA26F05BDCBA">>}]}, + {<<"telemetry">>, <<"68FDFE8D8F05A8428483A97D7AAB2F268AAFF24B49E0F599FAA091F1D4E7F61C">>}]}, {pkg_hash_ext,[ {<<"cowboy">>, <<"3AFDCCB7183CC6F143CB14D3CF51FA00E53DB9EC80CDCD525482F5E99BC41D6B">>}, {<<"cowboy_telemetry">>, <<"7D98BAC1EE4565D31B62D59F8823DFD8356A169E7FCBB83831B8A5397404C9DE">>}, {<<"cowlib">>, <<"163B73F6367A7341B33C794C4E88E7DBFE6498AC42DCD69EF44C5BC5507C8DB0">>}, {<<"opentelemetry_api">>, <<"DC77B9A00F137A858E60A852F14007BB66EDA1FFBEB6C05D5FE6C9E678B05E9D">>}, {<<"opentelemetry_semantic_conventions">>, <<"D61FA1F5639EE8668D74B527E6806E0503EFC55A42DB7B5F39939D84C07D6895">>}, - {<<"opentelemetry_telemetry">>, <<"3401D13A1D4B7AA941A77E6B3EC074F0AE77F83B5B2206766CE630123A9291A9">>}, + {<<"opentelemetry_telemetry">>, <<"EE43B14E6866123A3EE1344E3C0D3D7591F4537542C2A925FCDBF46249C9B50B">>}, {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>}, - {<<"telemetry">>, <<"DAD9CE9D8EFFC621708F99EAC538EF1CBE05D6A874DD741DE2E689C47FEAFED5">>}, - {<<"telemetry_registry">>, <<"6D0CA77B691CF854ED074B459A93B87F4C7F5512F8F7743C635CA83DA81F939E">>}]} + {<<"telemetry">>, <<"DAD9CE9D8EFFC621708F99EAC538EF1CBE05D6A874DD741DE2E689C47FEAFED5">>}]} ]. diff --git a/instrumentation/opentelemetry_cowboy/src/opentelemetry_cowboy.app.src b/instrumentation/opentelemetry_cowboy/src/opentelemetry_cowboy.app.src index 7ccb898..0dac1d3 100644 --- a/instrumentation/opentelemetry_cowboy/src/opentelemetry_cowboy.app.src +++ b/instrumentation/opentelemetry_cowboy/src/opentelemetry_cowboy.app.src @@ -9,9 +9,9 @@ opentelemetry_telemetry, telemetry ]}, + {exclude_paths, ["rebar.lock"]}, {env,[]}, {modules, []}, - {doc, "doc"}, {licenses, ["Apache 2.0"]}, {links, [{"GitHub", "https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_cowboy"}]}