handle and log query errors in type server (#106)

tsloughter · web-flow · commit 5863f5e352b0 · 2025-11-29T03:21:26.000-07:00
* bump opentelemetry api dependency

* decode and return pg errors for simple queries

* log message for failure to load types from database for server

* update ssl certs for tests
diff --git a/rebar.config b/rebar.config
@@ -2,7 +2,7 @@
 
 {deps, [{backoff, "~> 1.1.6"},
         {pg_types, "~> 0.5.0"},
-        {opentelemetry_api, "~> 1.4.0"}]}.
+        {opentelemetry_api, "~> 1.5"}]}.
 
 {profiles, [{test, [{erl_opts, [nowarn_export_all]},
                     {deps, [jsone,
diff --git a/rebar.lock b/rebar.lock
@@ -1,14 +1,14 @@
 {"1.2.0",
 [{<<"backoff">>,{pkg,<<"backoff">>,<<"1.1.6">>},0},
- {<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.4.0">>},0},
+ {<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.5.0">>},0},
  {<<"pg_types">>,{pkg,<<"pg_types">>,<<"0.5.0">>},0}]}.
 [
 {pkg_hash,[
  {<<"backoff">>, <<"83B72ED2108BA1EE8F7D1C22E0B4A00CFE3593A67DBC792799E8CCE9F42F796B">>},
- {<<"opentelemetry_api">>, <<"63CA1742F92F00059298F478048DFB826F4B20D49534493D6919A0DB39B6DB04">>},
+ {<<"opentelemetry_api">>, <<"1A676F3E3340CAB81C763E939A42E11A70C22863F645AA06AAFEFC689B5550CF">>},
  {<<"pg_types">>, <<"4FF09A61231EF33A10CF9524CECF8696EA2C971EE89204F95ACEFB1CFE9682DB">>}]},
 {pkg_hash_ext,[
  {<<"backoff">>, <<"CF0CFFF8995FB20562F822E5CC47D8CCF664C5ECDC26A684CBE85C225F9D7C39">>},
- {<<"opentelemetry_api">>, <<"3DFBBFAA2C2ED3121C5C483162836C4F9027DEF469C41578AF5EF32589FCFC58">>},
+ {<<"opentelemetry_api">>, <<"F53EC8A1337AE4A487D43AC89DA4BD3A3C99DDF576655D071DEED8B56A2D5DDA">>},
  {<<"pg_types">>, <<"A3023B464AA960BC1628635081E30CCA4F676F2D4C23CCD6179C1C11C9B4A642">>}]}
 ].
diff --git a/src/pgo_handler.erl b/src/pgo_handler.erl
@@ -634,6 +634,8 @@ simple_query_loop(#conn{socket=Socket}=Conn, Acc) ->
             simple_query_loop(Conn, Acc);
         {ok, #ready_for_query{}} ->
             {ok, Acc};
+        {ok, #error_response{fields=Fields}} ->
+            {error, {pgo_error, Fields}};
         {error, _} = ReceiveError ->
             ReceiveError
     end.
@@ -651,7 +653,9 @@ simple_receive_message(Socket, _Conn=#conn{socket_module=SocketModule}, _DecodeO
                         $C ->
                             {ok, command_complete};
                         $Z ->
-                            decode_ready_for_query_message(Rest)
+                            decode_ready_for_query_message(Rest);
+                        $E ->
+                            pgo_protocol:decode_error_response_message(Rest)
                     end;
                 {error, _} = ErrorRecvPacket ->
                     ErrorRecvPacket
diff --git a/src/pgo_protocol.erl b/src/pgo_protocol.erl
@@ -19,6 +19,7 @@
          encode_copy_done/0,
          encode_copy_fail/1,
          decode_message/4,
+         decode_error_response_message/1,
          decode_row/4,
          decode_strings/1,
          bind_requires_statement_description/1,
diff --git a/src/pgo_type_server.erl b/src/pgo_type_server.erl
@@ -11,6 +11,7 @@
 
 -include("pgo_internal.hrl").
 -include_lib("pg_types/include/pg_types.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -record(data, {pool        :: atom(),
                pool_config  :: pgo:pool_config(),
@@ -62,9 +63,13 @@ terminate(_, _, _Data) ->
 load(Pool, LastReload, RequestTime, PoolConfig) when LastReload < RequestTime ->
     try pgo_handler:open(Pool, PoolConfig) of
         {ok, Conn=#conn{parameters=Parameters}} ->
-            TypeInfos = load_and_update_types(Conn, Pool),
-            _ = pg_types:update(Pool, TypeInfos, Parameters),
-            TypeInfos;
+            case load_and_update_types(Conn, Pool) of
+                failed ->
+                    failed;
+                TypeInfos ->
+                    _ = pg_types:update(Pool, TypeInfos, Parameters),
+                    TypeInfos
+            end;
         {error, _} ->
             failed
     catch
@@ -86,22 +91,27 @@ load(_, _, _, _) ->
 
 load_and_update_types(Conn, Pool) ->
     try
-        {ok, Oids} = pgo_handler:simple_query(Conn, ?BOOTSTRAP_QUERY),
-        [#type_info{oid=binary_to_integer(Oid),
-                    pool=Pool,
-                    name=binary:copy(Name),
-                    typsend=binary:copy(Send),
-                    typreceive=binary:copy(Receive),
-                    typlen=binary_to_integer(Len),
-                    output=binary:copy(Output),
-                    input=binary:copy(Input),
-                    elem_oid=binary_to_integer(ArrayOid),
-                    base_oid=binary_to_integer(BaseOid),
-                    comp_oids=parse_array_oids(CompOids)}
-         || [Oid, Name, Send, Receive, Len, Output, Input, ArrayOid, BaseOid, CompOids] <- Oids]
+        case pgo_handler:simple_query(Conn, ?BOOTSTRAP_QUERY) of
+            {ok, Oids} ->
+                [#type_info{oid=binary_to_integer(Oid),
+                            pool=Pool,
+                            name=binary:copy(Name),
+                            typsend=binary:copy(Send),
+                            typreceive=binary:copy(Receive),
+                            typlen=binary_to_integer(Len),
+                            output=binary:copy(Output),
+                            input=binary:copy(Input),
+                            elem_oid=binary_to_integer(ArrayOid),
+                            base_oid=binary_to_integer(BaseOid),
+                            comp_oids=parse_array_oids(CompOids)}
+                 || [Oid, Name, Send, Receive, Len, Output, Input, ArrayOid, BaseOid, CompOids] <- Oids];
+            {error, {pgo_error, PgoError}} ->
+                ?LOG_WARNING("Unable to load type information. query failed with error: ~p", [PgoError]),
+                failed
+        end
     catch
-        _:_:_ ->
-
+        Class:Reason:Stacktrace ->
+            ?LOG_WARNING("Unable to load type information. pgo will not function properly: ~s", [erl_error:format_exception(Class, Reason, Stacktrace)]),
             failed
     after
         pgo_handler:close(Conn)
diff --git a/test/certs/server.crt b/test/certs/server.crt
@@ -1,21 +1,20 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/test/certs/server.key b/test/certs/server.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDoD/84QIb2yNgs
-LGUmIhKCqkzU0wYRx2fXCoWAioxOizH+Nd0r+HaI2VaVCNCcCA/1SH6O2ZvGzl0/
-WdMKbg2bu7HQHAYydSHLpsbpPmYGP+VBw89yY5QFORN2KmyQybISF856LMORUNft
-sUHiZOW7+T+lRRfYARy25wGu5gmrqsAS/x4Gw/ihNQKcFg6NnioyhdxKZbBFkRtm
-eFX4IwWLrRHt5cBUa8mgNpWNd0/lz+DdtUKVrSPECwwlDhC9tFVsk0ibjXQCHGAN
-mAvBsf48WREnThor2BETPWOsVCX8axxjssNwpXtT/TbhB9v1nEviJAfxSPdKsP2i
-4rQhYpd/AgMBAAECggEAMgylMEYmdZo6mUhX5mIJ2PmOyYXbtMDrgeMIiQEYoqX9
-ucR3N5EGS5yIQmtcxpIskuu4M+n14WpHjS67x++VasWP44Dvyzkc+VW2Z76n9WgZ
-c1Yeax7T4U5+hok+0flWOPW+d/YolbI4Z9DHk2LMc36dvfDJZDJVNZNb9xMw+b9Y
-IuC0CJgg1retXdfo2CABHB7QWozx0huhOmZyGbwxwJuG5jBSoOj3P/N36fm0CkPL
-6TAVFaEhOfja/8tySICGS1dw/XPmLDBzAMr+OABiji8bNh7/TUooX5cHDE2c44lg
-O4weN8FJL8zdKMm7tyiwPUB2uehAppkuxf48BWvzNQKBgQD+b8OLhM59xdCMoqqr
-ScW8mUSNUJJ91cRETRZBOxSN8hFifs69UN7kCJjV4aLhzIHfdB6QfuS1im1dZnKZ
-YlUk/ix6qk7JUl2k5HtL7bi13nRFp0dcN7jdAHtvi9FWxDRCEdiU0INLzUmbqj7N
-0Gh5Ndvgw4j1zSMkw9ffVucUEwKBgQDpfQm7AAN0TaivppJOcepReAokBHEtw1Bs
-vyNsbE8k82j2m+vhzUSS6e4TnGfSqipG6EoND29L39WvPWrcrw97tLmfkbnCvw5o
-+74Wl5+n5U/kMPlXOlLYk9UhpRFTuOAFN/3P51AAEmoXctPgfyfvN9aFQyiQTdLd
-OVQ826ckZQKBgG5w1uFVmUfwuHCDHy/QitstcBsi8SNbyaCYEWPpICfo/fDR+C0m
-0EkNDkIwecInQexbe/Tej6nZV1VmZbH8g9bV2Tq5eA9dCDbN0lMH8dhHohKl5Iy7
-xytuzSWC/C/8ZG6VTnxx8bvSdPPztuUhZGfQoAt09Js1Gt8Xfzl7gDwvAoGAZl7a
-K1EgMpfyA8FmmFo9wCZ/W7dO4B+oXWWYZGtAcBUAyk8mpsPW8wr5xUNoCedtzdT+
-0qcXxw6Go+Sru8JNaZGdaSb9aTNXYBQwDbvA1l4mHwiR6fq6ZBa89Zln9WszXVZl
-RAhI/R8VwN4po15c5fd3aMo/OLXGZBREqMItkDkCgYEA8295H8YoahfV1aBm6m3x
-QZH4uJkSRFSOepGcBkmIoPGdiYJ85+1fmBOeSQPvcQPgynLBTa6iSGbVkp1kCXvM
-mPyeNqjcWfh4Gay+fnRjDolc4NZoNVCB0aoyaH+wCZQyPIbGnqspm1piDz0jN7Pp
-In+OPiiumI/4hRHC5ZqB5NA=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCXV1SQY98iD04F
+0Xedp7MOiKj07rCtr4NerOaTh3RLR1HiQRM1OWInYt7HiuNJEg0QgadrJvMna5ZO
+z3TNiD+UMtW++VTRORoFbMJlOULtSu51xf2ZuYyydpWMn9+1DNLOW8gMxd8+sm2r
+A5DmLyLb/p6v+oHCPLOXmAnJ6v5ObvYNCuvqJh1k8IxV4OfIC/gAEojqEYx6eN0w
+9nvM1o7chyMFV1lqh2jApzywmJ6zCz3rCi9Y6Lxv0JI2pLAP2WuzlFZ9jQO5HOpa
+rHnUQvIeNVAevaknVMSKB5htD4scRCXQqcstgnC3fNeOWEIEQm8oicPin+F4nfbg
+qmLZXQ2hAgMBAAECggEAGI1KYsJRCK2C8t6wkRsLqWfyQQoYD5VRsqJKJdTrwOqp
+FhOIkjHlAo6/pY+an9gV1n+yMWf4OoTxtYdiY5We+uPkWT8Jy4d/+TFTuCg5+1UU
+qnacVbwMX0dtq4qkODMEYAXzxl6zgPBhakUB1NYAyb/c7p+tPV2rpQQ9UkyVRRPr
+O4cSVqw8R9UFQHz0qHMpdvfm3uUQJuB/7Ak7tEfnwZmbZpjUYE8EUySRUff7H14E
+yr0RFdS0Qvx2kmaLwZ3tOw2eiV8WcMjFdDz0eIiPVTYsS1S/MHHBucBLCErMScB+
+24377hndcN85tUJmFtkE27b25MLhHTHFxVa8Yb96IQKBgQDUJPuhlbgOkjwK+/T7
+l6DUGJvmqwg4yMd5Un5snEs1/wXPJ41+7CxYmcdEc6AgSyUyhqqIH5Y/r1wGh8xs
+P7732pibsmjG6QXG2OUSILVDit7aHiNdZ0SidLCSNUcRkjzsUNEvsvJsdiNGlLzc
+Q4mywRZrvOE75fLdS/U6kDyfFwKBgQC2oIo8tSmaw6Yg59V0Pt6rdiqZOMcWJss7
+HZ9cfhXwz5pw8q7QcxoJW6IHfalk/rKDYT8zMXpPfftYqhk5aDzEiMhCnoJvq1Fa
+q4VROYACOpjhc5NM+UALdi6md/rVHp7OfpLjnXsgsrG6FsmMDi3DatNm49LsdSCH
+yM0AZoFsBwKBgCWe4VjIWjmLSUaRY+JyAz1Zl9wSHIUlZepn7K+KD/RlYzxXQUpu
+y3Zy3tmOv6i6asBJDVjScSyeBm3KC0BvFYiSpVmHC/mqPTIEKKtMTZjKubZofdEE
+jTFaDC4BcLb2/gLSWiZhT4hYcu0DV3KgL30ZrMYyWqbqomUIIVbfWUDFAoGBAK4j
+mIzYhepf4pn/1eZ5SGOgUnA11ohFx4X/8gQE6jDsFCzdC1oSVuJTcMXJyetWfauO
+3++VnzYLP87Eqza1MTSJ5MK5WFDYv8NAR+gyduApNbvMM8my5aHIOCVdxFzRTMZD
+pRbLBCwimBuEPPyCTJrI0vmKBYaZDMLM8sUN+RyjAoGBAKnnL5pkKwNfzd3WgX5d
+PNbR/U7SupVYXrYzY36xL+NpPL3VJNNvuRQ55rpakw8S6aQzYcf2cNxH1sM2oRB8
+6qI4S+JM2T2QVoue6i/qNRAqNtndWRTDMzIcD+Q9U3PnJ2cH7ZjgGUy9QYVFin3/
+OpPHvMX30mRr4GSOVBB9mfI5
 -----END PRIVATE KEY-----
