From 802df221166d635f8b87dd56085bf3821e048f29 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 4 Jan 2022 13:34:37 -0700 Subject: [PATCH 1/3] add badges for hex packages --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 71b7e4a3..39dd02ae 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@ OpenTelemetry ===== -[![EEF Observability WG project](https://img.shields.io/badge/EEF-Observability-black)](https://github.com/erlef/eef-observability-wg) -![Build Status](https://github.com/open-telemetry/opentelemetry-erlang/workflows/Common%20Test/badge.svg) +[![Hex.pm](https://img.shields.io/hexpm/v/opentelemetry_api?label=API&style=for-the-badge)](https://hex.pm/packages/opentelemetry_api) +[![Hex.pm](https://img.shields.io/hexpm/v/opentelemetry?label=SDK&style=for-the-badge)](https://hex.pm/packages/opentelemetry) +[![Hex.pm](https://img.shields.io/hexpm/v/opentelemetry_exporter?label=OTLP%20Exporter&style=for-the-badge)](https://hex.pm/packages/opentelemetry_exporter) +[![EEF Observability WG +project](https://img.shields.io/badge/EEF-Observability-black?style=for-the-badge)](https://github.com/erlef/eef-observability-wg) +[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/open-telemetry/opentelemetry-erlang/Erlang?style=for-the-badge)](https://github.com/open-telemetry/opentelemetry-erlang/actions) [OpenTelemetry](https://opentelemetry.io/) distributed tracing framework for Erlang and Elixir. From d72038b253fb093e0a5f733c68e59eabb04e9cc3 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 4 Jan 2022 13:36:20 -0700 Subject: [PATCH 2/3] correct the erlang and elixir min requirements --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 39dd02ae..982d0945 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,11 @@ for a list of features supported. ## Requirements -- OTP 21.3+ +- Erlang/OTP 22+ If using the Elixir API: -- Elixir 1.8+ +- Elixir 1.11+ ## Contacting Us From 9b59e3cc831b989eddf3bda78ce3ed4ef3058a0b Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 4 Jan 2022 13:39:30 -0700 Subject: [PATCH 3/3] fix w3c interop github action --- .github/workflows/w3c_interop.yml | 11 +++++++---- README.md | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/w3c_interop.yml b/.github/workflows/w3c_interop.yml index 1e8c1989..85e77a7f 100644 --- a/.github/workflows/w3c_interop.yml +++ b/.github/workflows/w3c_interop.yml @@ -32,8 +32,9 @@ jobs: run: rebar3 as interop compile - uses: actions/checkout@v2 - repository: 'https://github.com/w3c/trace-context' - path: 'trace-context' + with: + repository: 'w3c/trace-context' + path: 'trace-context' - name: Setup python uses: actions/setup-python@v2 with: @@ -41,8 +42,10 @@ jobs: architecture: x64 - run: pip install aiohttp - run: | - erl -noinput -pa ./_build/interop/extras/interop/ $(rebar3 as interop path) -s w3c_trace_context_interop & + rebar3 as interop compile + erl -noinput -pa ./_build/interop/extras/interop/ $(rebar3 as interop path) -s w3c_trace_context_interop & + sleep 1 cd trace-context/test - python3 test.py http://127.0.0.1:5000/test + STRICT_LEVEL=1 python3 test.py http://127.0.0.1:5000/test shell: bash diff --git a/README.md b/README.md index 982d0945..fc1bbdea 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -OpenTelemetry +OpenTelemetry Erlang/Elixir ===== [![Hex.pm](https://img.shields.io/hexpm/v/opentelemetry_api?label=API&style=for-the-badge)](https://hex.pm/packages/opentelemetry_api) @@ -155,7 +155,7 @@ Start the interop web server in a shell: ``` shell $ rebar3 as interop shell -> w3c_trace_context_interop:run(). +> w3c_trace_context_interop:start(). ``` Then, clone the [W3C Trace Context repo](https://github.com/w3c/trace-context) and run the tests: