Skip to content

Commit

Permalink
Tidy log messages. Update deps and changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
@plorenz
plorenz committed Jun 13, 2024
1 parent 5518530 commit 6aaa43b
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 970 deletions.
925 changes: 0 additions & 925 deletions .merge_file_FAcDjN
View file

This file was deleted.

20 changes: 17 additions & 3 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,28 @@

* github.com/openziti/sdk-golang: [v0.23.37 -> v0.23.38](https://github.com/openziti/sdk-golang/compare/v0.23.37...v0.23.38)
* [Issue #573](https://github.com/openziti/sdk-golang/issues/573) - api session refresh spins in a tight loop if there is no current api session
* [Issue #562](https://github.com/openziti/sdk-golang/issues/562) - Support sticky dials

* github.com/openziti/channel/v2: [v2.0.130 -> v2.0.132](https://github.com/openziti/channel/compare/v2.0.130...v2.0.132)
* github.com/openziti/edge-api: [v0.26.19 -> v0.26.20](https://github.com/openziti/edge-api/compare/v0.26.19...v0.26.20)
* [Issue #113](https://github.com/openziti/edge-api/issues/113) - RecoveryCodesEnvelope is wrong

* github.com/openziti/channel/v2: [v2.0.130 -> v2.0.131](https://github.com/openziti/channel/compare/v2.0.130...v2.0.131)
* github.com/openziti/foundation/v2: [v2.0.45 -> v2.0.46](https://github.com/openziti/foundation/compare/v2.0.45...v2.0.46)
* [Issue #407](https://github.com/openziti/foundation/issues/407) - Remove Branch from build info

* github.com/openziti/identity: [v1.0.77 -> v1.0.78](https://github.com/openziti/identity/compare/v1.0.77...v1.0.78)
* github.com/openziti/identity: [v1.0.77 -> v1.0.79](https://github.com/openziti/identity/compare/v1.0.77...v1.0.79)
* github.com/openziti/metrics: [v1.2.54 -> v1.2.55](https://github.com/openziti/metrics/compare/v1.2.54...v1.2.55)
* github.com/openziti/transport/v2: [v2.0.133 -> v2.0.134](https://github.com/openziti/transport/compare/v2.0.133...v2.0.134)
* github.com/openziti/transport/v2: [v2.0.133 -> v2.0.135](https://github.com/openziti/transport/compare/v2.0.133...v2.0.135)
* golang.org/x/sys: v0.20.0 -> v0.21.0
* github.com/go-logr/logr: v1.4.1 -> v1.4.2
* go.opentelemetry.io/otel: v1.25.0 -> v1.27.0
* go.opentelemetry.io/otel/metric: v1.25.0 -> v1.27.0
* go.opentelemetry.io/otel/trace: v1.25.0 -> v1.27.0
* golang.org/x/crypto: v0.23.0 -> v0.24.0
* golang.org/x/net: v0.25.0 -> v0.26.0
* golang.org/x/term: v0.20.0 -> v0.21.0
* golang.org/x/text: v0.15.0 -> v0.16.0


# Release notes 0.23.37

Expand Down
26 changes: 13 additions & 13 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ require (
github.com/michaelquigley/pfxlog v0.6.10
github.com/mitchellh/go-ps v1.0.0
github.com/mitchellh/mapstructure v1.5.0
github.com/openziti/channel/v2 v2.0.131
github.com/openziti/edge-api v0.26.19
github.com/openziti/channel/v2 v2.0.132
github.com/openziti/edge-api v0.26.20
github.com/openziti/foundation/v2 v2.0.46
github.com/openziti/identity v1.0.78
github.com/openziti/identity v1.0.79
github.com/openziti/metrics v1.2.55
github.com/openziti/secretstream v0.1.20
github.com/openziti/transport/v2 v2.0.134
github.com/openziti/transport/v2 v2.0.135
github.com/orcaman/concurrent-map/v2 v2.0.1
github.com/pkg/errors v0.9.1
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
Expand All @@ -35,7 +35,7 @@ require (
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326
golang.org/x/oauth2 v0.20.0
golang.org/x/sys v0.20.0
golang.org/x/sys v0.21.0
google.golang.org/protobuf v1.34.1
)

Expand All @@ -44,7 +44,7 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
Expand Down Expand Up @@ -78,14 +78,14 @@ require (
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.mongodb.org/mongo-driver v1.15.0 // indirect
go.opentelemetry.io/otel v1.25.0 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.25.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/net v0.25.0 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/trace v1.27.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
nhooyr.io/websocket v1.8.11 // indirect
Expand Down
47 changes: 26 additions & 21 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
Expand Down Expand Up @@ -301,20 +301,20 @@ github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/openziti/channel/v2 v2.0.131 h1:BGCL0SatqvSLiwNFTaMUDXuvb9dB8EW61SOWEii/j7o=
github.com/openziti/channel/v2 v2.0.131/go.mod h1:kK5vZW+obIv9T+L9lLTlzf9vKdlok8z1kjJZLty6V9A=
github.com/openziti/edge-api v0.26.19 h1:EqDxmQGQEZ9ngzoFBlI/P7bL+0Xif29GRO8LWKdyYPI=
github.com/openziti/edge-api v0.26.19/go.mod h1:FGkZr+55qItptJBHriogJDo64OY85kuiEEWEZsik0+A=
github.com/openziti/channel/v2 v2.0.132 h1:qsUyUBVA8vs9pg6DzsjkJu/3ub/F197H0xM6KJwEwn8=
github.com/openziti/channel/v2 v2.0.132/go.mod h1:+FrQz1RiNwqlojxSilqb+/R66QGtM/czLD0NS/vYgXI=
github.com/openziti/edge-api v0.26.20 h1:r/61qDzU475mTXjZV/t3oGNN5szndzAR4OyhKjXb2jk=
github.com/openziti/edge-api v0.26.20/go.mod h1:BQryKiWKvoVn4sZEjVToSW/2tL+M1ylSWsNzRKUfl9Q=
github.com/openziti/foundation/v2 v2.0.46 h1:JoeJ9+Tluy/vbMog/QMf8oekqrjR4ghXc44EDLyko9U=
github.com/openziti/foundation/v2 v2.0.46/go.mod h1:88UifYC+Ia6VBQkGgszao/ixi8ymRME0werGo3fI55g=
github.com/openziti/identity v1.0.78 h1:DqJT8W9HSv4GwtZDJp5oP9OgCL4yzbX6n7Nqf6AKhHU=
github.com/openziti/identity v1.0.78/go.mod h1:2dhNjJIFkGhzv+KrISGafbiZgKqZsz0ySu3jnzo7cLU=
github.com/openziti/identity v1.0.79 h1:8hCeXh40/TesYIz4WYJ4Y25pILeJRzFNg4Oha0NCpOE=
github.com/openziti/identity v1.0.79/go.mod h1:2dhNjJIFkGhzv+KrISGafbiZgKqZsz0ySu3jnzo7cLU=
github.com/openziti/metrics v1.2.55 h1:g2uIYz7RwgfeGquGdRC+voKD1IvCbpgQtILkPtj6WwY=
github.com/openziti/metrics v1.2.55/go.mod h1:4MjPwits+NmsS50UFPzePF9b9lOiIrrXK/VNe0JHC/0=
github.com/openziti/secretstream v0.1.20 h1:9KOgXkUddf9KHur+B805a8wP0J447AO6Pmtz+eanub0=
github.com/openziti/secretstream v0.1.20/go.mod h1:TteVDQqouIoZgkwZhfiVdbnPNP3m87ik7kg/l9ahXzI=
github.com/openziti/transport/v2 v2.0.134 h1:wnZEESmP126I84pA8Aodqg6uhdNwtAG32AcJsmUiM+A=
github.com/openziti/transport/v2 v2.0.134/go.mod h1:Fw8CTXwkWgQTXHHBvXFwtQdkbjeXw7LHkI0BE8kQdGg=
github.com/openziti/transport/v2 v2.0.135 h1:dNGO88nAv6TQm0n2Fd326vkMIFbAHOMCwaO86B6AlKA=
github.com/openziti/transport/v2 v2.0.135/go.mod h1:TZeWXNw1H80gH6c/tRBLu9L2hFLgbE0hLg4ML/blkTY=
github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 h1:mOvehYivJ4Aqu2CPe3D3lv8jhqOI9/1o0THxJHBE0qw=
Expand Down Expand Up @@ -406,14 +406,14 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k=
go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg=
go.opentelemetry.io/otel/metric v1.25.0 h1:LUKbS7ArpFL/I2jJHdJcqMGxkRdxpPHE0VU/D4NuEwA=
go.opentelemetry.io/otel/metric v1.25.0/go.mod h1:rkDLUSd2lC5lq2dFNrX9LGAbINP5B7WBkC78RXCpH5s=
go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg=
go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ=
go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik=
go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak=
go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
go.opentelemetry.io/otel/trace v1.25.0 h1:tqukZGLwQYRIFtSQM2u2+yfMVTgGVeqRLPUYx1Dq6RM=
go.opentelemetry.io/otel/trace v1.25.0/go.mod h1:hCCs70XM/ljO+BeQkyFnbK28SBIJ/Emuha+ccrCRT7I=
go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw=
go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
Expand All @@ -427,8 +427,9 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -512,8 +513,9 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -604,16 +606,18 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -626,8 +630,9 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down
4 changes: 4 additions & 0 deletions ziti/edge/messages.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,10 @@ func GetLoggerFields(msg *channel.Message) logrus.Fields {
fields["uuid"] = msgUUID
}

if circuitId, found := msg.GetStringHeader(CircuitIdHeader); found {
fields["circuitId"] = circuitId
}

return fields
}

Expand Down
24 changes: 16 additions & 8 deletions ziti/edge/network/conn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ func (conn *edgeConn) Accept(msg *channel.Message) {

case ConnTypeBind:
if msg.ContentType == edge.ContentTypeDial {
logrus.WithFields(edge.GetLoggerFields(msg)).Debug("received dial request")
newConnId, _ := msg.GetUint32Header(edge.RouterProvidedConnId)
logrus.WithFields(edge.GetLoggerFields(msg)).WithField("newConnId", newConnId).Debug("received dial request")
go conn.newChildConnection(msg)
} else if msg.ContentType == edge.ContentTypeStateClosed {
conn.close(true)
Expand Down Expand Up @@ -575,7 +576,13 @@ func (conn *edgeConn) getListener(token string) (*edgeListener, bool) {

func (conn *edgeConn) newChildConnection(message *channel.Message) {
token := string(message.Body)
logger := pfxlog.Logger().WithField("connId", conn.Id()).WithField("token", token)
circuitId, _ := message.GetStringHeader(edge.CircuitIdHeader)
logger := pfxlog.Logger().WithField("connId", conn.Id())
if circuitId != "" {
logger = logger.WithField("circuitId", circuitId)
}
logger.WithField("token", token).Debug("logging token")

logger.Debug("looking up listener")
listener, found := conn.getListener(token)
if !found {
Expand All @@ -600,7 +607,6 @@ func (conn *edgeConn) newChildConnection(message *channel.Message) {

sourceIdentity, _ := message.GetStringHeader(edge.CallerIdHeader)
marker, _ := message.GetStringHeader(edge.ConnectionMarkerHeader)
circuitId, _ := message.GetStringHeader(edge.CircuitIdHeader)

edgeCh := &edgeConn{
MsgChannel: *edge.NewEdgeMsgChannel(conn.Channel, id),
Expand Down Expand Up @@ -648,11 +654,11 @@ func (conn *edgeConn) newChildConnection(message *channel.Message) {
}

if err != nil {
newConnLogger.WithError(err).Error("Failed to establish connection")
newConnLogger.WithError(err).Error("failed to establish connection")
reply := edge.NewDialFailedMsg(conn.Id(), err.Error())
reply.ReplyTo(message)
if err := reply.WithPriority(channel.Highest).WithTimeout(5 * time.Second).SendAndWaitForWire(conn.Channel); err != nil {
logger.WithError(err).Error("Failed to send reply to dial request")
logger.WithError(err).Error("failed to send reply to dial request")
}
return
}
Expand All @@ -663,11 +669,13 @@ func (conn *edgeConn) newChildConnection(message *channel.Message) {
message: message,
txHeader: txHeader,
routerProvidedConnId: routerProvidedConnId,
circuitId: circuitId,
}

if listener.manualStart {
edgeCh.acceptCompleteHandler = connHandler
} else if err := connHandler.dialSucceeded(); err != nil {
logger.Debug("calling dial succeeded")
return
}

Expand Down Expand Up @@ -729,6 +737,7 @@ type newConnHandler struct {
message *channel.Message
txHeader []byte
routerProvidedConnId bool
circuitId string
}

func (self *newConnHandler) dialFailed(err error) {
Expand All @@ -749,14 +758,13 @@ func (self *newConnHandler) dialFailed(err error) {
}

func (self *newConnHandler) dialSucceeded() error {
token := string(self.message.Body)
logger := pfxlog.Logger().WithField("connId", self.conn.Id()).WithField("token", token)
logger := pfxlog.Logger().WithField("connId", self.conn.Id()).WithField("circuitId", self.circuitId)

newConnLogger := pfxlog.Logger().
WithField("connId", self.edgeCh.Id()).
WithField("marker", self.edgeCh.marker).
WithField("parentConnId", self.conn.Id()).
WithField("token", token)
WithField("circuitId", self.circuitId)

newConnLogger.Debug("new connection established")

Expand Down

0 comments on commit 6aaa43b

Please sign in to comment.