From d8d4acc1006425519c96d4e5e05d5ba2f06835eb Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Sat, 30 Dec 2023 14:07:30 +0000 Subject: [PATCH] Update OpenTelemetry exporter configuration --- Examples/otel-dotnet/Program.cs | 29 ++--------- Examples/otel-dotnet/README.md | 5 +- .../bin/Debug/net6.0/otel-dotnet.dll | Bin 15872 -> 15360 bytes .../bin/Debug/net6.0/otel-dotnet.pdb | Bin 21808 -> 21644 bytes .../obj/Debug/net6.0/otel-dotnet.dll | Bin 15872 -> 15360 bytes .../obj/Debug/net6.0/otel-dotnet.pdb | Bin 21808 -> 21644 bytes .../obj/staticwebassets.pack.sentinel | 5 ++ Nginx/default.conf.template | 49 ++---------------- docker-compose.base.yml | 4 -- 9 files changed, 15 insertions(+), 77 deletions(-) diff --git a/Examples/otel-dotnet/Program.cs b/Examples/otel-dotnet/Program.cs index d7bca6993c..2d6b370ab5 100644 --- a/Examples/otel-dotnet/Program.cs +++ b/Examples/otel-dotnet/Program.cs @@ -7,8 +7,6 @@ using OpenTelemetry.Trace; var builder = WebApplication.CreateBuilder(args); -const string endpoint = "http://localhost:4317"; - Console.WriteLine($"Env var: {Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS")?.ToString()}"); @@ -30,14 +28,7 @@ builder.Logging.AddOpenTelemetry(logging => .AddConsoleExporter() .AddOtlpExporter(opt => { - // If endpoint was not specified, the proper one will be selected according to the protocol. - if (!string.IsNullOrEmpty(endpoint)) - { - opt.Endpoint = new Uri(endpoint); - - // Set headers in OTLP exporter - // opt.Headers = "oneuptime-service-token=0a00ebc0-7f39-11ee-ac8c-3fb43926b224"; - } + System.Console.WriteLine($"OTLP Exporter is using {opt.Protocol} protocol and endpoint {opt.Endpoint}"); }); @@ -52,15 +43,7 @@ builder.Services.AddOpenTelemetry() .AddConsoleExporter() .AddOtlpExporter(opt => { - // If endpoint was not specified, the proper one will be selected according to the protocol. - if (!string.IsNullOrEmpty(endpoint)) - { - opt.Endpoint = new Uri(endpoint); - // Set headers in OTLP exporter - // opt.Headers = "oneuptime-service-token=0a00ebc0-7f39-11ee-ac8c-3fb43926b224"; - - - } + System.Console.WriteLine($"OTLP Exporter is using {opt.Protocol} protocol and endpoint {opt.Endpoint}"); })); @@ -82,13 +65,7 @@ builder.Services.AddOpenTelemetry() }) .AddOtlpExporter(opt => { - // If endpoint was not specified, the proper one will be selected according to the protocol. - if (!string.IsNullOrEmpty(endpoint)) - { - opt.Endpoint = new Uri(endpoint); - // Set headers in OTLP exporter - // opt.Headers = "oneuptime-service-token=0a00ebc0-7f39-11ee-ac8c-3fb43926b224"; - } + System.Console.WriteLine($"OTLP Exporter is using {opt.Protocol} protocol and endpoint {opt.Endpoint}"); diff --git a/Examples/otel-dotnet/README.md b/Examples/otel-dotnet/README.md index 85079730f0..4941623c49 100644 --- a/Examples/otel-dotnet/README.md +++ b/Examples/otel-dotnet/README.md @@ -5,5 +5,6 @@ Please use ```bash -export OTEL_EXPORTER_OTLP_HEADERS="x-oneuptime-service-token=9c8806e0-a4aa-11ee-be95-010d5967b068" && export OTEL_EXPORTER_OTLP_ENDPOINT="https://localhost/opentelemetry-collector" && dotnet run --urls=http://localhost:7856/ -``` \ No newline at end of file +export OTEL_EXPORTER_OTLP_HEADERS="x-oneuptime-service-token=9c8806e0-a4aa-11ee-be95-010d5967b068" && export OTEL_EXPORTER_OTLP_ENDPOINT="http://localhost/opentelemetry-collector" && dotnet run --urls=http://localhost:7856/ +``` + diff --git a/Examples/otel-dotnet/bin/Debug/net6.0/otel-dotnet.dll b/Examples/otel-dotnet/bin/Debug/net6.0/otel-dotnet.dll index 89c324d8301e2fcf0c6432239873bad521f1e688..91e729354cd1b60acdd1da71caeb0ff9928b5e09 100644 GIT binary patch delta 3392 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 E3(MnvoB#j- diff --git a/Examples/otel-dotnet/bin/Debug/net6.0/otel-dotnet.pdb b/Examples/otel-dotnet/bin/Debug/net6.0/otel-dotnet.pdb index da98d400cfc47984d227994581fb06d6bb69c548..fc0453c0cfcf65555d4749e9a5390e3ec05671eb 100644 GIT binary patch delta 1048 zcmZ9LUr1A77{=fCJ7@E3%ekeqH0LyDP19&#r7TiZk_dN3ItU%D^1@a#!G$1X+tM_d zusC8X(i=wyALf7CpLh?fjSU&TH|Q4G+iX?YI(uSD>MbQqxS55nF>3PK29Ovs4eLo=`1O zeQ;6?5WbSm6%h(WnKKuHea%PcQ|Ma?{XL~sz-S((M!cm>L(B)$hMdsKMw;!!It9z; z>lEBYoUP!E#CiqG`5Xny=SBs05U(c=s?rx0k&#P=lJm&>%k`v98JwTN8#1^+F>is+ ziWK~i*a9qX?SgM)Y+emWE38z?<7~k$=M<>H?<`>|$Pq)-OT{Vb<>Ec+72-1WYO#b< zfsc9?bW#`Kh!`U0Ds|ZjkuxbSlk=In>@1V>Mr`0!V0AU{veUrJ8G3-GHtU|fwO+5k zx9g}sAU)&Cq#xX?l2EW?;mllgXz=69y4_FpA^q<~r|N$9oxy(hYuzNPp8dsF9ugo95A4ODGuYIm3M*$@T$fo;upo}OaO~iAq!qr)hR?C#PdM_NjW*-h zG)4j}>SeJcOZeE(MLZwC(f4@a5*p~U#bOP@akbD2$OhB^LQjP`FQd3Hfq96>K`RmgMCLuuH5fq(2Ich+t-dz)tXB(dq@T1LhBK7+#?iHgC12wmK_^ zkvR^dS2&EDI84k`2s9)MuwQbt+l^7LDe48NOq-!`X|TP@knoujK7d-yYSbgmw>u1x WfGHCAmkdk1yG$EPnqo;x0sH~nET*Uc delta 1177 zcmZvbTSydP6vxl`X4Ek+xvgs|+U~lNOND8fl?mB}EX$oG?Lq}*c3Hz!Q9<;f-R+`i zW^1!*L=Ra+8AKOf3X^;&iXM82E<~V#z0^YwMlS{RpAl;kzu}zk{Qlqh&iQt}+3q2} zcbmfn2POrP>m<>bL{vW()dq+ifvUE5V*1VKG6-L-8q<{%dCdBGcN>kotT zjvnv-ymRBG!P3y8vc2y-uSVk^_J-YD)%z%)fA@Y(OJHQ7nNcxSOW^Wj&pk}vVLxGR zm1#Mw1m;(fMoi6!HP~f?blPF511|ta1>p3N0ki6YiIbtt@Os3yS)4M97tZ1| zQ@xj1%P{dXupMljY48I=)^vjQRXF7pRPE8?C3oP0=PE_hC69xn=$q#dyh|N}_o)sM zMHkc{{GfUj{)RdRKcr5;-%%Y>6n%k@p^xwieNux^a=bx92|`)qoq*B^ujfoasqvP` zr~|JnB{Fg(T$y%FDo~Er9cieqscY8WN|TNsk1zke=*UVQbr%1cdhJ~GJ$dV!-92YV zZ+5ojJbmI@I{ZOivfZxGVsa{ENspE()9NmwEtH>2aVhR-MCpaYF7Fi)SeodgW;_j4 zM9cBiQax2u6=olzCae@u0jV+bLR;69Li;k(3EJ;7428JYlG;z%RLV`91;<~ z=o=RUE#mYG?y&Q@J>1QlgG**dEK|0uBoax)0$;IHC>9E^(#qtMsT^XfEY57e+omM{ zicDiup=GX3Jnz3f9k=v7R{xI7B-|o<(P+O=QuKmGk;=J?MC(QN8J%Tx?(Wj7P~ow) z>G*rIm6#1IG1 zYyB1ZmWbaL@e}=3uWRosmL(0e*aljN*2GTdHfhO~>ypADTR8MD^OAP3(iPh`ZtELI G7X1MVG`*kz diff --git a/Examples/otel-dotnet/obj/Debug/net6.0/otel-dotnet.dll b/Examples/otel-dotnet/obj/Debug/net6.0/otel-dotnet.dll index 89c324d8301e2fcf0c6432239873bad521f1e688..91e729354cd1b60acdd1da71caeb0ff9928b5e09 100644 GIT binary patch delta 3392 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 E3(MnvoB#j- diff --git a/Examples/otel-dotnet/obj/Debug/net6.0/otel-dotnet.pdb b/Examples/otel-dotnet/obj/Debug/net6.0/otel-dotnet.pdb index da98d400cfc47984d227994581fb06d6bb69c548..fc0453c0cfcf65555d4749e9a5390e3ec05671eb 100644 GIT binary patch delta 1048 zcmZ9LUr1A77{=fCJ7@E3%ekeqH0LyDP19&#r7TiZk_dN3ItU%D^1@a#!G$1X+tM_d zusC8X(i=wyALf7CpLh?fjSU&TH|Q4G+iX?YI(uSD>MbQqxS55nF>3PK29Ovs4eLo=`1O zeQ;6?5WbSm6%h(WnKKuHea%PcQ|Ma?{XL~sz-S((M!cm>L(B)$hMdsKMw;!!It9z; z>lEBYoUP!E#CiqG`5Xny=SBs05U(c=s?rx0k&#P=lJm&>%k`v98JwTN8#1^+F>is+ ziWK~i*a9qX?SgM)Y+emWE38z?<7~k$=M<>H?<`>|$Pq)-OT{Vb<>Ec+72-1WYO#b< zfsc9?bW#`Kh!`U0Ds|ZjkuxbSlk=In>@1V>Mr`0!V0AU{veUrJ8G3-GHtU|fwO+5k zx9g}sAU)&Cq#xX?l2EW?;mllgXz=69y4_FpA^q<~r|N$9oxy(hYuzNPp8dsF9ugo95A4ODGuYIm3M*$@T$fo;upo}OaO~iAq!qr)hR?C#PdM_NjW*-h zG)4j}>SeJcOZeE(MLZwC(f4@a5*p~U#bOP@akbD2$OhB^LQjP`FQd3Hfq96>K`RmgMCLuuH5fq(2Ich+t-dz)tXB(dq@T1LhBK7+#?iHgC12wmK_^ zkvR^dS2&EDI84k`2s9)MuwQbt+l^7LDe48NOq-!`X|TP@knoujK7d-yYSbgmw>u1x WfGHCAmkdk1yG$EPnqo;x0sH~nET*Uc delta 1177 zcmZvbTSydP6vxl`X4Ek+xvgs|+U~lNOND8fl?mB}EX$oG?Lq}*c3Hz!Q9<;f-R+`i zW^1!*L=Ra+8AKOf3X^;&iXM82E<~V#z0^YwMlS{RpAl;kzu}zk{Qlqh&iQt}+3q2} zcbmfn2POrP>m<>bL{vW()dq+ifvUE5V*1VKG6-L-8q<{%dCdBGcN>kotT zjvnv-ymRBG!P3y8vc2y-uSVk^_J-YD)%z%)fA@Y(OJHQ7nNcxSOW^Wj&pk}vVLxGR zm1#Mw1m;(fMoi6!HP~f?blPF511|ta1>p3N0ki6YiIbtt@Os3yS)4M97tZ1| zQ@xj1%P{dXupMljY48I=)^vjQRXF7pRPE8?C3oP0=PE_hC69xn=$q#dyh|N}_o)sM zMHkc{{GfUj{)RdRKcr5;-%%Y>6n%k@p^xwieNux^a=bx92|`)qoq*B^ujfoasqvP` zr~|JnB{Fg(T$y%FDo~Er9cieqscY8WN|TNsk1zke=*UVQbr%1cdhJ~GJ$dV!-92YV zZ+5ojJbmI@I{ZOivfZxGVsa{ENspE()9NmwEtH>2aVhR-MCpaYF7Fi)SeodgW;_j4 zM9cBiQax2u6=olzCae@u0jV+bLR;69Li;k(3EJ;7428JYlG;z%RLV`91;<~ z=o=RUE#mYG?y&Q@J>1QlgG**dEK|0uBoax)0$;IHC>9E^(#qtMsT^XfEY57e+omM{ zicDiup=GX3Jnz3f9k=v7R{xI7B-|o<(P+O=QuKmGk;=J?MC(QN8J%Tx?(Wj7P~ow) z>G*rIm6#1IG1 zYyB1ZmWbaL@e}=3uWRosmL(0e*aljN*2GTdHfhO~>ypADTR8MD^OAP3(iPh`ZtELI G7X1MVG`*kz diff --git a/Examples/otel-dotnet/obj/staticwebassets.pack.sentinel b/Examples/otel-dotnet/obj/staticwebassets.pack.sentinel index b3820604ab..0927a334ea 100644 --- a/Examples/otel-dotnet/obj/staticwebassets.pack.sentinel +++ b/Examples/otel-dotnet/obj/staticwebassets.pack.sentinel @@ -41,3 +41,8 @@ 2.0 2.0 2.0 +2.0 +2.0 +2.0 +2.0 +2.0 diff --git a/Nginx/default.conf.template b/Nginx/default.conf.template index 3517ea41d4..81b2717828 100644 --- a/Nginx/default.conf.template +++ b/Nginx/default.conf.template @@ -1,3 +1,5 @@ +error_log /var/log/nginx/error.log debug; + upstream accounts { server ${SERVER_ACCOUNTS_HOSTNAME}:${ACCOUNTS_PORT} weight=10 max_fails=3 fail_timeout=30s; } @@ -33,44 +35,10 @@ upstream workers { upstream opentelemetry-collector { - server ${SERVER_OTEL_COLLECTOR_HOSTNAME}:${OTEL_COLLECTOR_HTTP_PORT} weight=10 max_fails=3 fail_timeout=30s; + server ${SERVER_OTEL_COLLECTOR_HOSTNAME}:${OTEL_COLLECTOR_HTTP_PORT}; } -# Otel Collector -server { - - gzip on; - gzip_types text/plain application/xml text/html application/javascript text/javascript text/css application/json; - gzip_proxied no-cache no-store private expired auth; - gzip_min_length 1000; - - listen 80; - - server_name oneuptime-opentelemetry-collector ${OTEL_COLLECTOR_HOST}; - - proxy_busy_buffers_size 512k; - proxy_buffers 4 512k; - proxy_buffer_size 256k; - - fastcgi_buffers 16 16k; - fastcgi_buffer_size 32k; - - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - - # enable WebSockets (for ws://sockjs not connected error in the accounts source: https://stackoverflow.com/questions/41381444/websocket-connection-failed-error-during-websocket-handshake-unexpected-respon) - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - - proxy_pass http://opentelemetry-collector; - } - -} # Status Pages @@ -358,16 +326,7 @@ server { } location /opentelemetry-collector { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - - # enable WebSockets (for ws://sockjs not connected error in the accounts source: https://stackoverflow.com/questions/41381444/websocket-connection-failed-error-during-websocket-handshake-unexpected-respon) - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_pass http://opentelemetry-collector; + grpc_pass grpc://${SERVER_OTEL_COLLECTOR_HOSTNAME}:${OTEL_COLLECTOR_GRPC_PORT}; } location /notification { diff --git a/docker-compose.base.yml b/docker-compose.base.yml index eaad686083..4833fa3df8 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -290,10 +290,6 @@ services: networks: - oneuptime restart: always - ports: - - '4317:4317' - - '4318:4318' - ingestor: networks: