open-telemetry
/
opentelemetry-erlang
mirror of https://github.com/open-telemetry/opentelemetry-erlang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use elixir formatter

This commit is contained in:
Chulki Lee 2020-11-29 15:49:29 +09:00
parent e91eb24d0d
commit e44f7cd407
12 changed files with 83 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.formatter.exs Normal file
View File

@ -0,0 +1,3 @@
[
inputs: ["{mix,.formatter}.exs", "{samples,test}/**/*.{ex,exs}"]
]

19
.github/workflows/elixir.yml vendored
View File

@ -9,6 +9,25 @@ on:
- 'master'
jobs:
format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-elixir@v1
with:
otp-version: '23.1'
elixir-version: '1.11.1'
- uses: actions/cache@v2
name: Cache
with:
path: |
apps/opentelemetry_api/deps
key: v2-${{ hashFiles('apps/opentelemetry_api/mix.lock') }}
- run: mix format --check-formatted
- run: mix deps.get
working-directory: apps/opentelemetry_api/
- run: mix format --check-formatted
working-directory: apps/opentelemetry_api/
sdk_tests:
runs-on: ${{ matrix.os }}
name: Test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }}) and ${{ matrix.os }}

3
apps/opentelemetry_api/.formatter.exs Normal file
View File

@ -0,0 +1,3 @@
[
inputs: ["{mix,.dialyzer_ignore,.formatter}.exs", "{lib,test}/**/*.{ex,exs}"]
]

13
apps/opentelemetry_api/lib/open_telemetry/counter.ex
View File

@ -16,13 +16,22 @@ defmodule OpenTelemetry.Counter do
defmacro add(name, number, label_set) do
quote do
:otel_meter.record(:opentelemetry.get_meter(__MODULE__), unquote(name), unquote(number), unquote(label_set))
:otel_meter.record(
:opentelemetry.get_meter(__MODULE__),
unquote(name),
unquote(number),
unquote(label_set)
)
end
end
defmacro add(bound_instrument, number) do
quote do
:otel_meter.record(:opentelemetry.get_meter(__MODULE__), unquote(bound_instrument), unquote(number))
:otel_meter.record(
:opentelemetry.get_meter(__MODULE__),
unquote(bound_instrument),
unquote(number)
)
end
end

12
apps/opentelemetry_api/lib/open_telemetry/span.ex
View File

@ -66,7 +66,11 @@ defmodule OpenTelemetry.Span do
@doc """
Set an attribute with key and value on the currently active Span.
"""
@spec set_attribute(OpenTelemetry.span_ctx(), OpenTelemetry.attribute_key(), OpenTelemetry.attribute_value()) :: boolean()
@spec set_attribute(
OpenTelemetry.span_ctx(),
OpenTelemetry.attribute_key(),
OpenTelemetry.attribute_value()
) :: boolean()
defdelegate set_attribute(span_ctx, key, value), to: :otel_span
@doc """
@ -78,7 +82,11 @@ defmodule OpenTelemetry.Span do
@doc """
Add an event to the currently active Span.
"""
@spec add_event(OpenTelemetry.span_ctx(), OpenTelemetry.event_name(), OpenTelemetry.attributes()) :: boolean()
@spec add_event(
OpenTelemetry.span_ctx(),
OpenTelemetry.event_name(),
OpenTelemetry.attributes()
) :: boolean()
defdelegate add_event(span_ctx, event, attributes), to: :otel_span
@doc """

13
apps/opentelemetry_api/lib/open_telemetry/updown_counter.ex
View File

@ -16,13 +16,22 @@ defmodule OpenTelemetry.UpdownCounter do
defmacro add(name, number, label_set) do
quote do
:otel_meter.record(:opentelemetry.get_meter(__MODULE__), unquote(name), unquote(number), unquote(label_set))
:otel_meter.record(
:opentelemetry.get_meter(__MODULE__),
unquote(name),
unquote(number),
unquote(label_set)
)
end
end
defmacro add(bound_instrument, number) do
quote do
:otel_meter.record(:opentelemetry.get_meter(__MODULE__), unquote(bound_instrument), unquote(number))
:otel_meter.record(
:opentelemetry.get_meter(__MODULE__),
unquote(bound_instrument),
unquote(number)
)
end
end

6
apps/opentelemetry_api/lib/open_telemetry/updown_sum_observer.ex
View File

@ -8,7 +8,11 @@ defmodule OpenTelemetry.UpdownSumObserver do
defmacro new(name, opts \\ %{}) do
quote do
:otel_updown_sum_observer.new(:opentelemetry.get_meter(__MODULE__), unquote(name), unquote(opts))
:otel_updown_sum_observer.new(
:opentelemetry.get_meter(__MODULE__),
unquote(name),
unquote(opts)
)
end
end

3
apps/opentelemetry_api/mix.exs
View File

@ -63,8 +63,7 @@ defmodule OpenTelemetry.MixProject do
[
description: "OpenTelemetry API",
build_tools: ["rebar3", "mix"],
files:
~w(lib mix.exs README.md LICENSE rebar.config VERSION include src),
files: ~w(lib mix.exs README.md LICENSE rebar.config VERSION include src),
licenses: ["Apache-2.0"],
links: %{
"GitHub" => "https://github.com/open-telemetry/opentelemetry-erlang",

4
apps/opentelemetry_api/test/open_telemetry_test.exs
View File

@ -40,7 +40,6 @@ defmodule OpenTelemetryTest do
assert 2 == s
assert [] == ts
assert [{"attr-1", "value-1"}] == a
end
test "macro start_span" do
@ -62,7 +61,7 @@ defmodule OpenTelemetryTest do
assert nil != Span.trace_id(span)
assert nil != Span.span_id(span)
assert [] = Span.tracestate(span)
assert [] = Span.tracestate(span)
end
end
@ -102,5 +101,4 @@ defmodule OpenTelemetryTest do
Ctx.detach(token)
assert %{"a" => "b"} = Baggage.get_all()
end
end

6
mix.exs
View File

@ -10,7 +10,9 @@ defmodule OtelElixirTests.MixProject do
end
def deps do
[{:opentelemetry, path: "apps/opentelemetry", only: :test},
{:opentelemetry_api, path: "apps/opentelemetry_api", only: :test, override: true}]
[
{:opentelemetry, path: "apps/opentelemetry", only: :test},
{:opentelemetry_api, path: "apps/opentelemetry_api", only: :test, override: true}
]
end
end

15
test/otel_tests.exs
View File

@ -19,8 +19,11 @@ defmodule OtelTests do
Tracer.set_attributes([{"attr-2", "value-2"}])
end
assert_receive {:span, span(name: "span-1", attributes: [{"attr-1", "value-1"},
{"attr-2", "value-2"}])}
assert_receive {:span,
span(
name: "span-1",
attributes: [{"attr-1", "value-1"}, {"attr-2", "value-2"}]
)}
end
test "use Span to set attributes" do
@ -32,8 +35,10 @@ defmodule OtelTests do
assert span_ctx() = Span.end_span(s)
assert_receive {:span, span(name: "span-2", attributes: [{"attr-1", "value-1"},
{"attr-2", "value-2"}])}
assert_receive {:span,
span(
name: "span-2",
attributes: [{"attr-1", "value-1"}, {"attr-2", "value-2"}]
)}
end
end

6
test/test_helper.exs
View File

@ -1,6 +1,10 @@
Application.stop(:opentelemetry)
Application.load(:opentelemetry)
Application.put_env(:opentelemetry, :processors, [{:otel_batch_processor, %{scheduled_delay_ms: 1}}])
Application.put_env(:opentelemetry, :processors, [
{:otel_batch_processor, %{scheduled_delay_ms: 1}}
])
Application.ensure_all_started(:opentelemetry)
ExUnit.start()