Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: adhere to specs to not call functions on :ok module #1904

Merged
merged 3 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/logflare/logs/logs.ex
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ defmodule Logflare.Logs do

RejectedLogEvents.ingest(le)

le

{:error, :buffer_full} ->
:telemetry.execute(
[:logflare, :logs, :ingest_logs],
Expand Down
38 changes: 34 additions & 4 deletions test/logflare_web/controllers/log_controller_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ defmodule LogflareWeb.LogControllerTest do
alias Logflare.Sources

@valid %{"some" => "valid log entry", "event_message" => "hi!"}
@invalid %{"some" => {123, "invalid"}, 123 => "hi!", 1 => :invalid}
@valid_batch [
%{"some" => "valid log entry", "event_message" => "hi!"},
%{"some" => "valid log entry 2", "event_message" => "hi again!"}
Expand Down Expand Up @@ -68,7 +69,8 @@ defmodule LogflareWeb.LogControllerTest do
end
end

describe "v1 pipeline with legacy user.api_key" do

describe "v1 pipeline invalid" do
setup [:v1_pipeline_setup, :warm_caches, :reject_context_functions]

setup %{user: user, conn: conn} do
Expand All @@ -77,6 +79,25 @@ defmodule LogflareWeb.LogControllerTest do
{:ok, user: user, conn: conn}
end

test ":create rejected logs ingestion", %{conn: conn, source: source} do
conn =
conn
|> post(Routes.log_path(conn, :create, source: source.token), @invalid)

assert %{"message"=> [msg]} = json_response(conn, 406)
assert msg =~ "not supported by"
end
end

describe "v1 pipeline with legacy user.api_key" do
setup [:v1_pipeline_setup, :warm_caches, :reject_context_functions, :expect_broadcast]

setup %{user: user, conn: conn} do
conn = put_req_header(conn, "x-api-key", user.api_key)

{:ok, user: user, conn: conn}
end

test ":create ingestion by source_name", %{conn: conn, source: source} do
conn =
conn
Expand All @@ -97,6 +118,9 @@ defmodule LogflareWeb.LogControllerTest do
:timer.sleep(2000)
end




test ":create ingestion with gzip", %{conn: conn, source: source} do
batch = for _i <- 1..1500, do: @valid
payload = :zlib.gzip(Jason.encode!(%{"batch" => batch}))
Expand Down Expand Up @@ -148,7 +172,7 @@ defmodule LogflareWeb.LogControllerTest do
end

describe "v1 pipeline with access tokens" do
setup [:v1_pipeline_setup]
setup [:v1_pipeline_setup, :expect_broadcast]

setup %{user: user, conn: conn} do
{:ok, access_token} = Logflare.Auth.create_access_token(user)
Expand Down Expand Up @@ -224,6 +248,13 @@ defmodule LogflareWeb.LogControllerTest do
start_supervised!({RecentLogsServer, rls})
:timer.sleep(500)

Logflare.Logs
|> stub(:broadcast, fn le -> le end)

{:ok, source: source, user: user, conn: conn}
end

defp expect_broadcast(_) do
Logflare.Logs
|> expect(:broadcast, 1, fn le ->
assert match?(@valid, le.body)
Expand All @@ -232,8 +263,7 @@ defmodule LogflareWeb.LogControllerTest do

le
end)

{:ok, source: source, user: user, conn: conn}
:ok
end

defp warm_caches(%{user: user, source: source}) do
Expand Down
Loading