From 28c1b38ec6bff37aa3f57b5e8daa72c906524ebc Mon Sep 17 00:00:00 2001 From: Aleksey Kashapov Date: Tue, 24 Oct 2023 16:14:18 +0300 Subject: [PATCH] TD-686: Adopts opentelemetry API (#40) --- Makefile | 11 +- .../src/party_management.app.src | 5 +- compose.tracing.yaml | 21 ++++ compose.yml => compose.yaml | 10 +- rebar.config | 11 +- rebar.lock | 56 +++++++-- test/dominant/sys.config | 119 ++++++++++++++++++ test/machinegun/config.yaml | 10 ++ 8 files changed, 217 insertions(+), 26 deletions(-) create mode 100644 compose.tracing.yaml rename compose.yml => compose.yaml (89%) create mode 100644 test/dominant/sys.config diff --git a/Makefile b/Makefile index 0dc40d7..25c966b 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,6 @@ # For example, to run with podman put `DOCKER=podman` there. -include Makefile.env --include .env - # NOTE # Variables specified in `.env` file are used to pick and setup specific # component versions, both when building a development image and when running @@ -18,7 +16,7 @@ DEV_IMAGE_ID = $(file < .image.dev) DOCKER ?= docker DOCKERCOMPOSE ?= docker-compose -DOCKERCOMPOSE_W_ENV = DEV_IMAGE_TAG=$(DEV_IMAGE_TAG) $(DOCKERCOMPOSE) +DOCKERCOMPOSE_W_ENV = DEV_IMAGE_TAG=$(DEV_IMAGE_TAG) $(DOCKERCOMPOSE) -f compose.yaml -f compose.tracing.yaml REBAR ?= rebar3 TEST_CONTAINER_NAME ?= testrunner @@ -42,7 +40,7 @@ DOCKER_WC_OPTIONS := -v $(PWD):$(PWD) --workdir $(PWD) DOCKER_WC_EXTRA_OPTIONS ?= --rm DOCKER_RUN = $(DOCKER) run -t $(DOCKER_WC_OPTIONS) $(DOCKER_WC_EXTRA_OPTIONS) -DOCKERCOMPOSE_RUN = $(DOCKERCOMPOSE_W_ENV) run --rm $(DOCKER_WC_OPTIONS) $(TEST_CONTAINER_NAME) +DOCKERCOMPOSE_RUN = $(DOCKERCOMPOSE_W_ENV) run --rm $(DOCKER_WC_OPTIONS) # Utility tasks @@ -52,13 +50,12 @@ wc-shell: dev-image wc-%: dev-image $(DOCKER_RUN) $(DEV_IMAGE_TAG) make $* -# TODO docker compose down doesn't work yet wdeps-shell: dev-image - $(DOCKERCOMPOSE_RUN) su; \ + $(DOCKERCOMPOSE_RUN) $(TEST_CONTAINER_NAME) su; \ $(DOCKERCOMPOSE_W_ENV) down wdeps-%: dev-image - $(DOCKERCOMPOSE_RUN) make $*; \ + $(DOCKERCOMPOSE_RUN) -T $(TEST_CONTAINER_NAME) make $*; \ res=$$?; \ $(DOCKERCOMPOSE_W_ENV) down; \ exit $$res diff --git a/apps/party_management/src/party_management.app.src b/apps/party_management/src/party_management.app.src index cfee163..c62bc8a 100644 --- a/apps/party_management/src/party_management.app.src +++ b/apps/party_management/src/party_management.app.src @@ -17,7 +17,10 @@ dmt_client, payproc_errors, erl_health, - cache + cache, + opentelemetry_api, + opentelemetry_exporter, + opentelemetry ]}, {env, []}, {modules, []}, diff --git a/compose.tracing.yaml b/compose.tracing.yaml new file mode 100644 index 0000000..f712b3c --- /dev/null +++ b/compose.tracing.yaml @@ -0,0 +1,21 @@ +services: + testrunner: + depends_on: + jaeger: + condition: service_healthy + + jaeger: + image: jaegertracing/all-in-one:1.47 + environment: + - COLLECTOR_OTLP_ENABLED=true + healthcheck: + test: "/go/bin/all-in-one-linux status" + interval: 2s + timeout: 1s + retries: 20 + ports: + - 4317:4317 # OTLP gRPC receiver + - 4318:4318 # OTLP http receiver + - 5778:5778 + - 14250:14250 + - 16686:16686 diff --git a/compose.yml b/compose.yaml similarity index 89% rename from compose.yml rename to compose.yaml index 0d679ae..5bbd315 100644 --- a/compose.yml +++ b/compose.yaml @@ -24,12 +24,14 @@ services: command: /sbin/init dominant: - image: ghcr.io/valitydev/dominant:sha-486d2ef + image: ghcr.io/valitydev/dominant:sha-2150eea depends_on: - machinegun ports: - "8022" command: /opt/dominant/bin/dominant foreground + volumes: + - ./test/dominant/sys.config:/opt/dominant/releases/0.1/sys.config healthcheck: test: "/opt/dominant/bin/dominant ping" interval: 5s @@ -37,9 +39,7 @@ services: retries: 20 machinegun: - image: ghcr.io/valitydev/machinegun:sha-7f0a21a - ports: - - "8022" + image: ghcr.io/valitydev/machinegun:sha-5c0db56 command: /opt/machinegun/bin/machinegun foreground volumes: - ./test/machinegun/config.yaml:/opt/machinegun/etc/config.yaml @@ -48,7 +48,7 @@ services: test: "/opt/machinegun/bin/machinegun ping" interval: 5s timeout: 1s - retries: 20 + retries: 10 shumway: image: ghcr.io/valitydev/shumway:sha-658587c diff --git a/rebar.config b/rebar.config index 292fe59..3b61e8d 100644 --- a/rebar.config +++ b/rebar.config @@ -35,7 +35,12 @@ {mg_proto, {git, "https://github.com/valitydev/machinegun-proto.git", {branch, "master"}}}, {dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {branch, "master"}}}, {scoper, {git, "https://github.com/valitydev/scoper.git", {branch, "master"}}}, - {erl_health, {git, "https://github.com/valitydev/erlang-health.git", {branch, "master"}}} + {erl_health, {git, "https://github.com/valitydev/erlang-health.git", {branch, "master"}}}, + + %% OpenTelemetry deps + {opentelemetry_api, "1.2.1"}, + {opentelemetry, "1.3.0"}, + {opentelemetry_exporter, "1.3.0"} ]}. {xref_checks, [ @@ -72,8 +77,7 @@ % for introspection on production {recon, "2.5.2"}, {logger_logstash_formatter, - {git, "https://github.com/valitydev/logger_logstash_formatter.git", - {ref, "87e52c755cf9e64d651e3ddddbfcd2ccd1db79db"}}}, + {git, "https://github.com/valitydev/logger_logstash_formatter.git", {ref, "08a66a6"}}}, {iosetopts, {git, "https://github.com/valitydev/iosetopts.git", {ref, "edb445c"}}} ]}, {relx, [ @@ -82,6 +86,7 @@ {recon, load}, {runtime_tools, load}, {tools, load}, + {opentelemetry, temporary}, {logger_logstash_formatter, load}, woody_api_hay, how_are_you, diff --git a/rebar.lock b/rebar.lock index aff7f2b..4636c1e 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,19 +1,22 @@ {"1.2.0", -[{<<"cache">>,{pkg,<<"cache">>,<<"2.3.3">>},0}, +[{<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0">>},2}, + {<<"cache">>,{pkg,<<"cache">>,<<"2.3.3">>},0}, {<<"certifi">>,{pkg,<<"certifi">>,<<"2.8.0">>},2}, {<<"cg_mon">>, {git,"https://github.com/rbkmoney/cg_mon.git", {ref,"5a87a37694e42b6592d3b4164ae54e0e87e24e18"}}, 1}, + {<<"chatterbox">>,{pkg,<<"ts_chatterbox">>,<<"0.13.0">>},2}, {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},1}, {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},2}, + {<<"ctx">>,{pkg,<<"ctx">>,<<"0.6.0">>},2}, {<<"damsel">>, {git,"https://github.com/valitydev/damsel.git", - {ref,"c65fc2e6a829f440a82720b3602b7bab4f30b71d"}}, + {ref,"f718741970470474efcd32800daf885cb8d75584"}}, 0}, {<<"dmt_client">>, {git,"https://github.com/valitydev/dmt_client.git", - {ref,"899bd71161b4d483719987014be007d7bcf7cfc3"}}, + {ref,"b8bc0281dbf1e55a1a67ef6da861e0353ff14913"}}, 0}, {<<"dmt_core">>, {git,"https://github.com/valitydev/dmt-core.git", @@ -21,14 +24,16 @@ 1}, {<<"erl_health">>, {git,"https://github.com/valitydev/erlang-health.git", - {ref,"5958e2f35cd4d09f40685762b82b82f89b4d9333"}}, + {ref,"7ffbc855bdbe79e23efad1803b0b185c9ea8d2f1"}}, 0}, {<<"genlib">>, {git,"https://github.com/valitydev/genlib.git", - {ref,"82c5ff3866e3019eb347c7f1d8f1f847bed28c10"}}, + {ref,"f6074551d6586998e91a97ea20acb47241254ff3"}}, 0}, {<<"gproc">>,{pkg,<<"gproc">>,<<"0.9.0">>},0}, + {<<"grpcbox">>,{pkg,<<"grpcbox">>,<<"0.16.0">>},1}, {<<"hackney">>,{pkg,<<"hackney">>,<<"1.18.0">>},1}, + {<<"hpack">>,{pkg,<<"hpack_erl">>,<<"0.2.3">>},3}, {<<"idna">>,{pkg,<<"idna">>,<<"6.1.1">>},2}, {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},1}, {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2}, @@ -37,6 +42,14 @@ {ref,"96f7f11b184c29d8b7e83cd7646f3f2c13662bda"}}, 0}, {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},2}, + {<<"opentelemetry">>,{pkg,<<"opentelemetry">>,<<"1.3.0">>},0}, + {<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.2.1">>},0}, + {<<"opentelemetry_exporter">>, + {pkg,<<"opentelemetry_exporter">>,<<"1.3.0">>}, + 0}, + {<<"opentelemetry_semantic_conventions">>, + {pkg,<<"opentelemetry_semantic_conventions">>,<<"0.2.0">>}, + 1}, {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.1">>},2}, {<<"payproc_errors">>, {git,"https://github.com/valitydev/payproc-errors-erlang.git", @@ -45,51 +58,74 @@ {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},2}, {<<"scoper">>, {git,"https://github.com/valitydev/scoper.git", - {ref,"7f3183df279bc8181efe58dafd9cae164f495e6f"}}, + {ref,"41a14a558667316998af9f49149ee087ffa8bef2"}}, 0}, {<<"snowflake">>, {git,"https://github.com/valitydev/snowflake.git", {ref,"de159486ef40cec67074afe71882bdc7f7deab72"}}, 1}, - {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},2}, + {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.7">>},2}, {<<"thrift">>, {git,"https://github.com/valitydev/thrift_erlang.git", {ref,"c280ff266ae1c1906fb0dcee8320bb8d8a4a3c75"}}, 1}, + {<<"tls_certificate_check">>, + {pkg,<<"tls_certificate_check">>,<<"1.19.0">>}, + 1}, {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},2}, {<<"woody">>, {git,"https://github.com/valitydev/woody_erlang.git", - {ref,"0c2e16dfc8a51f6f63fcd74df982178a9aeab322"}}, + {ref,"5d46291a6bfcee0bae2a9346a7d927603a909249"}}, 0}]}. [ {pkg_hash,[ + {<<"acceptor_pool">>, <<"43C20D2ACAE35F0C2BCD64F9D2BDE267E459F0F3FD23DAB26485BF518C281B21">>}, {<<"cache">>, <<"B23A5FE7095445A88412A6E614C933377E0137B44FFED77C9B3FEF1A731A20B2">>}, {<<"certifi">>, <<"D4FB0A6BB20B7C9C3643E22507E42F356AC090A1DCEA9AB99E27E0376D695EBA">>}, + {<<"chatterbox">>, <<"6F059D97BCAA758B8EA6FFFE2B3B81362BD06B639D3EA2BB088335511D691EBF">>}, {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>}, {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>}, + {<<"ctx">>, <<"8FF88B70E6400C4DF90142E7F130625B82086077A45364A78D208ED3ED53C7FE">>}, {<<"gproc">>, <<"853CCB7805E9ADA25D227A157BA966F7B34508F386A3E7E21992B1B484230699">>}, + {<<"grpcbox">>, <<"B83F37C62D6EECA347B77F9B1EC7E9F62231690CDFEB3A31BE07CD4002BA9C82">>}, {<<"hackney">>, <<"C4443D960BB9FBA6D01161D01CD81173089686717D9490E5D3606644C48D121F">>}, + {<<"hpack">>, <<"17670F83FF984AE6CD74B1C456EDDE906D27FF013740EE4D9EFAA4F1BF999633">>}, {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>}, {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>}, {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>}, {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>}, + {<<"opentelemetry">>, <<"988AC3C26ACAC9720A1D4FB8D9DC52E95B45ECFEC2D5B5583276A09E8936BC5E">>}, + {<<"opentelemetry_api">>, <<"7B69ED4F40025C005DE0B74FCE8C0549625D59CB4DF12D15C32FE6DC5076FF42">>}, + {<<"opentelemetry_exporter">>, <<"1D8809C0D4F4ACF986405F7700ED11992BCBDB6A4915DD11921E80777FFA7167">>}, + {<<"opentelemetry_semantic_conventions">>, <<"B67FE459C2938FCAB341CB0951C44860C62347C005ACE1B50F8402576F241435">>}, {<<"parse_trans">>, <<"16328AB840CC09919BD10DAB29E431DA3AF9E9E7E7E6F0089DD5A2D2820011D8">>}, {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>}, - {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>}, + {<<"ssl_verify_fun">>, <<"354C321CF377240C7B8716899E182CE4890C5938111A1296ADD3EC74CF1715DF">>}, + {<<"tls_certificate_check">>, <<"C76C4C5D79EE79A2B11C84F910C825D6F024A78427C854F515748E9BD025E987">>}, {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]}, {pkg_hash_ext,[ + {<<"acceptor_pool">>, <<"0CBCD83FDC8B9AD2EEE2067EF8B91A14858A5883CB7CD800E6FCD5803E158788">>}, {<<"cache">>, <<"44516CE6FA03594D3A2AF025DD3A87BFE711000EB730219E1DDEFC816E0AA2F4">>}, {<<"certifi">>, <<"6AC7EFC1C6F8600B08D625292D4BBF584E14847CE1B6B5C44D983D273E1097EA">>}, + {<<"chatterbox">>, <<"B93D19104D86AF0B3F2566C4CBA2A57D2E06D103728246BA1AC6C3C0FF010AA7">>}, {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>}, {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>}, + {<<"ctx">>, <<"A14ED2D1B67723DBEBBE423B28D7615EB0BDCBA6FF28F2D1F1B0A7E1D4AA5FC2">>}, {<<"gproc">>, <<"587E8AF698CCD3504CF4BA8D90F893EDE2B0F58CABB8A916E2BF9321DE3CF10B">>}, + {<<"grpcbox">>, <<"294DF743AE20A7E030889F00644001370A4F7CE0121F3BBDAF13CF3169C62913">>}, {<<"hackney">>, <<"9AFCDA620704D720DB8C6A3123E9848D09C87586DC1C10479C42627B905B5C5E">>}, + {<<"hpack">>, <<"06F580167C4B8B8A6429040DF36CC93BBA6D571FAEAEC1B28816523379CBB23A">>}, {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>}, {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>}, {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>}, {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>}, + {<<"opentelemetry">>, <<"8E09EDC26AAD11161509D7ECAD854A3285D88580F93B63B0B1CF0BAC332BFCC0">>}, + {<<"opentelemetry_api">>, <<"6D7A27B7CAD2AD69A09CABF6670514CAFCEC717C8441BEB5C96322BAC3D05350">>}, + {<<"opentelemetry_exporter">>, <<"2B40007F509D38361744882FD060A8841AF772AB83BB542AA5350908B303AD65">>}, + {<<"opentelemetry_semantic_conventions">>, <<"D61FA1F5639EE8668D74B527E6806E0503EFC55A42DB7B5F39939D84C07D6895">>}, {<<"parse_trans">>, <<"07CD9577885F56362D414E8C4C4E6BDF10D43A8767ABB92D24CBE8B24C54888B">>}, {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>}, - {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>}, + {<<"ssl_verify_fun">>, <<"FE4C190E8F37401D30167C8C405EDA19469F34577987C76DDE613E838BBC67F8">>}, + {<<"tls_certificate_check">>, <<"4083B4A298ADD534C96125337CB01161C358BB32DD870D5A893AAE685FD91D70">>}, {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>}]} ]. diff --git a/test/dominant/sys.config b/test/dominant/sys.config new file mode 100644 index 0000000..c41852e --- /dev/null +++ b/test/dominant/sys.config @@ -0,0 +1,119 @@ +%% NOTE Consider DRYing config in composed services +[ + {opentelemetry, [ + {span_processor, batch}, + {traces_exporter, otlp}, + {sampler, + {parent_based, #{ + root => always_off, + remote_parent_sampled => always_on, + remote_parent_not_sampled => always_off, + local_parent_sampled => always_on, + local_parent_not_sampled => always_off + }}} + ]}, + + {opentelemetry_exporter, [ + {otlp_protocol, http_protobuf}, + {otlp_endpoint, "http://jaeger:4318"} + ]}, + + {kernel, [ + {logger_level, info}, + {logger, [ + {handler, default, logger_std_h, #{ + config => #{ + type => standard_io + }, + formatter => {logger_logstash_formatter, #{ + log_level_map => #{ + emergency => 'ERROR', + alert => 'ERROR', + critical => 'ERROR', + error => 'ERROR', + warning => 'WARN', + notice => 'INFO', + info => 'INFO', + debug => 'DEBUG' + } + }} + }} + ]} + ]}, + + {dmt_api, [ + {repository, dmt_api_repository_v5}, + {migration, #{ + timeout => 360, + limit => 20, + read_only_gap => 1000 + }}, + {ip, "::"}, + {port, 8022}, + {default_woody_handling_timeout, 30000}, + {woody_event_handlers, [ + {scoper_woody_event_handler, #{ + event_handler_opts => #{ + formatter_opts => #{ + max_length => 1000, + max_printable_string_length => 80 + } + } + }} + ]}, + {transport_opts, #{ + max_connections => 1024 + }}, + {protocol_opts, #{ + % http keep alive timeout in ms + request_timeout => 60000, + % Should be greater than any other timeouts + idle_timeout => infinity + }}, + % 50Mb + {max_cache_size, 52428800}, + {health_check, #{ + disk => {erl_health, disk, ["/", 99]}, + memory => {erl_health, cg_memory, [99]}, + service => {erl_health, service, [<<"dominant">>]} + }}, + {services, #{ + automaton => #{ + url => "http://machinegun:8022/v1/automaton", + transport_opts => #{ + pool => woody_automaton, + timeout => 1000, + max_connections => 1024 + } + } + }} + ]}, + + {os_mon, [ + % for better compatibility with busybox coreutils + {disksup_posix_only, true} + ]}, + + {scoper, [ + {storage, scoper_storage_logger} + ]}, + + {snowflake, [ + {max_backward_clock_moving, 1000}, % 1 second + {machine_id, hostname_hash} + ]}, + + {prometheus, [ + {collectors, [default]} + ]}, + + {how_are_you, [ + {metrics_publishers, [ + % {hay_statsd_publisher, #{ + % key_prefix => <<"dominant.">>, + % host => "localhost", + % port => 8125 + % }} + ]} + ]} +]. diff --git a/test/machinegun/config.yaml b/test/machinegun/config.yaml index d13e9d5..22e71d6 100644 --- a/test/machinegun/config.yaml +++ b/test/machinegun/config.yaml @@ -21,3 +21,13 @@ storage: woody_server: max_concurrent_connections: 8000 http_keep_alive_timeout: 15S + +logging: + out_type: stdout + level: info + +opentelemetry: + service_name: machinegun + exporter: + protocol: http/protobuf + endpoint: http://jaeger:4318