envoy 1.21.0 #90921

XuehaiPan · 2021-12-10T15:26:59Z

Migrate stand-alone formula envoy to Python 3.10. Part of PR #90716.

cclauss · 2021-12-10T17:38:11Z

These tests are being run on Python 3.5 which thinks that Python type hints are a syntax error.

branchvincent · 2021-12-16T04:05:37Z

File "/tmp/envoy-20211216-11802-y4loia/.brew_home/_bazel/c8017d5c263d650d08e7b606fae0ff95/sandbox/processwrapper-sandbox/2817/execroot/envoy/external/com_googlesource_chromium_v8/wee8/third_party/jinja2/tests.py", line 13, in <module>
      from collections import Mapping
  ImportError: cannot import name 'Mapping' from 'collections'

XuehaiPan · 2021-12-16T06:47:47Z

It is issued with the Google V8 Engine:

https://github.com/envoyproxy/envoy/blob/8618d52d9244f62f6931f766faee0d9061f2501d/bazel/repository_locations.bzl#L826-L840

$ wget -O - https://storage.googleapis.com/envoyproxy-wee8/wee8-9.6.180.12.tar.gz | tar -xz

$ grep -r 'from collections import Mapping' wee8
wee8/third_party/jinja2/tests.py:from collections import Mapping
wee8/third_party/jinja2/sandbox.py:from collections import Mapping
wee8/third_party/jinja2/runtime.py:    from collections import Mapping

collections.Mapping was deprecated since Python 3.3 and was removed in Python 3.10. It should change to from collections.abc import Mapping.

jinja fixed this in pallets/jinja@31bf9b7 three years ago. Seems the Google V8 Engine still uses a legacy version of dependencies.

cclauss · 2021-12-16T13:55:03Z

This might be better as an Envoy issue. https://github.com/envoyproxy/envoy/issues

XuehaiPan · 2021-12-17T05:42:50Z

Waiting for pull request envoyproxy/envoy#19244 to be merged and released.

github-actions · 2022-01-07T06:33:58Z

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

XuehaiPan · 2022-01-08T07:31:51Z

Waiting for a new release of envoy.

cclauss · 2022-01-13T03:44:20Z

https://github.com/envoyproxy/envoy/releases

XuehaiPan · 2022-01-13T11:04:30Z

In:
https://github.com/envoyproxy/envoy/blob/8cdfe788027127210beb08ad58bbc8754c71af2d/source/extensions/transport_sockets/tcp_stats/tcp_stats.cc#L12

#include </usr/include/linux/tcp.h>

It's a hardcoded header path.

Related PR: Add transport socket wrapper to collect OS-level TCP stats and export as envoy metrics envoyproxy/envoy#17682

I can build envoy on Ubuntu 20.04 successfully.

On Ubuntu 16.04 LTS:

struct tcp_info {
	__u8	tcpi_state;
	__u8	tcpi_ca_state;
	__u8	tcpi_retransmits;
	__u8	tcpi_probes;
	__u8	tcpi_backoff;
	__u8	tcpi_options;
	__u8	tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;

	__u32	tcpi_rto;
	__u32	tcpi_ato;
	__u32	tcpi_snd_mss;
	__u32	tcpi_rcv_mss;

	__u32	tcpi_unacked;
	__u32	tcpi_sacked;
	__u32	tcpi_lost;
	__u32	tcpi_retrans;
	__u32	tcpi_fackets;

	/* Times. */
	__u32	tcpi_last_data_sent;
	__u32	tcpi_last_ack_sent;     /* Not remembered, sorry. */
	__u32	tcpi_last_data_recv;
	__u32	tcpi_last_ack_recv;

	/* Metrics. */
	__u32	tcpi_pmtu;
	__u32	tcpi_rcv_ssthresh;
	__u32	tcpi_rtt;
	__u32	tcpi_rttvar;
	__u32	tcpi_snd_ssthresh;
	__u32	tcpi_snd_cwnd;
	__u32	tcpi_advmss;
	__u32	tcpi_reordering;

	__u32	tcpi_rcv_rtt;
	__u32	tcpi_rcv_space;

	__u32	tcpi_total_retrans;

	__u64	tcpi_pacing_rate;
	__u64	tcpi_max_pacing_rate;
	__u64	tcpi_bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
	__u64	tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
	__u32	tcpi_segs_out;	     /* RFC4898 tcpEStatsPerfSegsOut */
	__u32	tcpi_segs_in;	     /* RFC4898 tcpEStatsPerfSegsIn */
};

On Ubuntu 20.04 LTS:

struct tcp_info {
	__u8	tcpi_state;
	__u8	tcpi_ca_state;
	__u8	tcpi_retransmits;
	__u8	tcpi_probes;
	__u8	tcpi_backoff;
	__u8	tcpi_options;
	__u8	tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
	__u8	tcpi_delivery_rate_app_limited:1;

	__u32	tcpi_rto;
	__u32	tcpi_ato;
	__u32	tcpi_snd_mss;
	__u32	tcpi_rcv_mss;

	__u32	tcpi_unacked;
	__u32	tcpi_sacked;
	__u32	tcpi_lost;
	__u32	tcpi_retrans;
	__u32	tcpi_fackets;

	/* Times. */
	__u32	tcpi_last_data_sent;
	__u32	tcpi_last_ack_sent;     /* Not remembered, sorry. */
	__u32	tcpi_last_data_recv;
	__u32	tcpi_last_ack_recv;

	/* Metrics. */
	__u32	tcpi_pmtu;
	__u32	tcpi_rcv_ssthresh;
	__u32	tcpi_rtt;
	__u32	tcpi_rttvar;
	__u32	tcpi_snd_ssthresh;
	__u32	tcpi_snd_cwnd;
	__u32	tcpi_advmss;
	__u32	tcpi_reordering;

	__u32	tcpi_rcv_rtt;
	__u32	tcpi_rcv_space;

	__u32	tcpi_total_retrans;

	__u64	tcpi_pacing_rate;
	__u64	tcpi_max_pacing_rate;
	__u64	tcpi_bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
	__u64	tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
	__u32	tcpi_segs_out;	     /* RFC4898 tcpEStatsPerfSegsOut */
	__u32	tcpi_segs_in;	     /* RFC4898 tcpEStatsPerfSegsIn */

	__u32	tcpi_notsent_bytes;
	__u32	tcpi_min_rtt;
	__u32	tcpi_data_segs_in;	/* RFC4898 tcpEStatsDataSegsIn */
	__u32	tcpi_data_segs_out;	/* RFC4898 tcpEStatsDataSegsOut */

	__u64   tcpi_delivery_rate;

	__u64	tcpi_busy_time;      /* Time (usec) busy sending data */
	__u64	tcpi_rwnd_limited;   /* Time (usec) limited by receive window */
	__u64	tcpi_sndbuf_limited; /* Time (usec) limited by send buffer */

	__u32	tcpi_delivered;
	__u32	tcpi_delivered_ce;

	__u64	tcpi_bytes_sent;     /* RFC4898 tcpEStatsPerfHCDataOctetsOut */
	__u64	tcpi_bytes_retrans;  /* RFC4898 tcpEStatsPerfOctetsRetrans */
	__u32	tcpi_dsack_dups;     /* RFC4898 tcpEStatsStackDSACKDups */
	__u32	tcpi_reord_seen;     /* reordering events seen */

	__u32	tcpi_rcv_ooopack;    /* Out-of-order packets received */

	__u32	tcpi_snd_wnd;	     /* peer's advertised receive window after
				      * scaling (bytes)
				      */
};

Diff:

8a9
> 	__u8	tcpi_delivery_rate_app_limited:1;
47a49,73
> 
> 	__u32	tcpi_notsent_bytes;
> 	__u32	tcpi_min_rtt;
> 	__u32	tcpi_data_segs_in;	/* RFC4898 tcpEStatsDataSegsIn */
> 	__u32	tcpi_data_segs_out;	/* RFC4898 tcpEStatsDataSegsOut */
> 
> 	__u64   tcpi_delivery_rate;
> 
> 	__u64	tcpi_busy_time;      /* Time (usec) busy sending data */
> 	__u64	tcpi_rwnd_limited;   /* Time (usec) limited by receive window */
> 	__u64	tcpi_sndbuf_limited; /* Time (usec) limited by send buffer */
> 
> 	__u32	tcpi_delivered;
> 	__u32	tcpi_delivered_ce;
> 
> 	__u64	tcpi_bytes_sent;     /* RFC4898 tcpEStatsPerfHCDataOctetsOut */
> 	__u64	tcpi_bytes_retrans;  /* RFC4898 tcpEStatsPerfOctetsRetrans */
> 	__u32	tcpi_dsack_dups;     /* RFC4898 tcpEStatsStackDSACKDups */
> 	__u32	tcpi_reord_seen;     /* reordering events seen */
> 
> 	__u32	tcpi_rcv_ooopack;    /* Out-of-order packets received */
> 
> 	__u32	tcpi_snd_wnd;	     /* peer's advertised receive window after
> 				      * scaling (bytes)
> 				      */

XuehaiPan · 2022-01-17T06:57:20Z

Formula/envoy.rb

+    if OS.linux? && OS.kernel_version < "4.6"
+      # Extension `tcp_stats` requires Linux headers >= 4.6
+      # (It's included by absolute path `#include </usr/include/linux/tcp.h>`)
+      # Disable it when the kernel version requirements not satisfied
+      args << "--//source/extensions/transport_sockets/tcp_stats:enabled=false"
+    end
+


The CI container failed to detect the correct kernel version (Linux Kernel for Ubuntu 16.04 is 4.4.0).

Should we always disable this extension on Linux? (#93273 (comment))

My guess is yes. But CC @Homebrew/linux

Instead of looking at the kernel version, can we read the tcp_stats.cc file and make a decision based on that?

Search tcpi_data_segs in https://github.com/envoyproxy/envoy/blob/release/v1.21/source/extensions/transport_sockets/tcp_stats/tcp_stats.cc#L12

See #90921 (comment) for full struct definition for struct tcp_info in /usr/include/linux/tcp.h.

$ docker run -it --rm -h ubuntu --pull always --entrypoint cat ghcr.io/homebrew/ubuntu16.04:latest /usr/include/linux/tcp.h > tcp-16.04.h latest: Pulling from homebrew/ubuntu16.04 Digest: sha256:30574285516868f78fc3d0fa6fd2b6705a8a23ce799b8252e1a66bdbc20e3c82 Status: Image is up to date for ghcr.io/homebrew/ubuntu16.04:latest $ docker run -it --rm -h ubuntu --pull always --entrypoint cat ghcr.io/homebrew/ubuntu20.04:latest /usr/include/linux/tcp.h > tcp-20.04.h latest: Pulling from homebrew/ubuntu20.04 Digest: sha256:71779eeb4f5d6d6d7890de20c5fbecbcb705665921de4c31555819a333cf5a3e Status: Image is up to date for ghcr.io/homebrew/ubuntu20.04:latest $ diff tcp-16.04.h tcp-20.04.h ... 159a214 > __u8 tcpi_delivery_rate_app_limited:1; 198a254,305 > > __u32 tcpi_notsent_bytes; > __u32 tcpi_min_rtt; > __u32 tcpi_data_segs_in; /* RFC4898 tcpEStatsDataSegsIn */ > __u32 tcpi_data_segs_out; /* RFC4898 tcpEStatsDataSegsOut */ > > __u64 tcpi_delivery_rate; > > __u64 tcpi_busy_time; /* Time (usec) busy sending data */ > __u64 tcpi_rwnd_limited; /* Time (usec) limited by receive window */ > __u64 tcpi_sndbuf_limited; /* Time (usec) limited by send buffer */ > > __u32 tcpi_delivered; > __u32 tcpi_delivered_ce; > > __u64 tcpi_bytes_sent; /* RFC4898 tcpEStatsPerfHCDataOctetsOut */ > __u64 tcpi_bytes_retrans; /* RFC4898 tcpEStatsPerfOctetsRetrans */ > __u32 tcpi_dsack_dups; /* RFC4898 tcpEStatsStackDSACKDups */ > __u32 tcpi_reord_seen; /* reordering events seen */ > > __u32 tcpi_rcv_ooopack; /* Out-of-order packets received */ > > __u32 tcpi_snd_wnd; /* peer's advertised receive window after > * scaling (bytes) > */ > }; ...

The old header doesn't have fields tcpi_data_segs_in and tcpi_data_segs_out.

XuehaiPan · 2022-01-17T11:07:45Z

Need label CI-long-timeout.

XuehaiPan · 2022-01-19T08:59:17Z

All tests passed.

XuehaiPan · 2022-01-20T14:06:08Z

May need to remove the label automerge-skip.

BrewTestBot · 2022-01-20T14:13:01Z

@branchvincent has triggered a merge.

branchvincent · 2022-01-20T14:17:37Z

@XuehaiPan thanks for sticking with this one!

codefromthecrypt · 2022-01-22T01:27:37Z

Thanks, folks. This is great progress

This update the last known Envoy version to 1.21 now that it exists in Homebrew. Note: this is the first to work with arm64+darwin. See Homebrew/homebrew-core#90921 Signed-off-by: Adrian Cole <adrian@tetrate.io>

BrewTestBot added the no ARM bottle Formula has no ARM bottle label Dec 10, 2021

XuehaiPan mentioned this pull request Dec 10, 2021

Migrate remaining stand-alone formulae to Python 3.10 #90716

Closed

branchvincent added the python-3.10-migration label Dec 10, 2021

XuehaiPan mentioned this pull request Dec 11, 2021

python@3.10: migrate aliases #87075

Closed

6 tasks

XuehaiPan force-pushed the envoy-python3.10-migration branch from c83b65d to 76930c2 Compare December 11, 2021 11:52

branchvincent added the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Dec 16, 2021

branchvincent force-pushed the envoy-python3.10-migration branch from 76930c2 to 2dad65c Compare December 16, 2021 01:34

iMichka removed the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Dec 16, 2021

XuehaiPan mentioned this pull request Dec 17, 2021

wasm: update V8 to v9.7.106.17. envoyproxy/envoy#19244

Merged

github-actions bot added the stale No recent activity label Jan 7, 2022

github-actions bot removed the stale No recent activity label Jan 8, 2022

branchvincent force-pushed the envoy-python3.10-migration branch from 2dad65c to 980a7d7 Compare January 13, 2022 04:13

branchvincent changed the title ~~envoy: migrate to python@3.10~~ envoy 1.21.0 Jan 13, 2022

branchvincent added the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Jan 13, 2022

chenrui333 added the CI-requeued PR has been re-added to the queue label Jan 13, 2022

XuehaiPan force-pushed the envoy-python3.10-migration branch from 980a7d7 to b48f757 Compare January 13, 2022 08:29

SMillerDev removed the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Jan 13, 2022

XuehaiPan force-pushed the envoy-python3.10-migration branch from b48f757 to 1b3663d Compare January 16, 2022 14:24

BrewTestBot added the automerge-skip `brew pr-automerge` will skip this pull request label Jan 16, 2022

XuehaiPan force-pushed the envoy-python3.10-migration branch 2 times, most recently from 3824cc3 to 5178fd7 Compare January 16, 2022 14:32

XuehaiPan mentioned this pull request Jan 17, 2022

Detecting Linux Kernel version in CI test container #93273

Closed

2 tasks

XuehaiPan commented Jan 17, 2022

View reviewed changes

envoy 1.21.0

f45f2bb

XuehaiPan force-pushed the envoy-python3.10-migration branch from 5178fd7 to f45f2bb Compare January 17, 2022 09:56

iMichka added the long build Set a long timeout for formula testing label Jan 17, 2022

branchvincent added the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Jan 19, 2022

SMillerDev approved these changes Jan 19, 2022

View reviewed changes

iMichka removed the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Jan 19, 2022

branchvincent removed the automerge-skip `brew pr-automerge` will skip this pull request label Jan 20, 2022

BrewTestBot closed this in c28e8b1 Jan 20, 2022

XuehaiPan deleted the envoy-python3.10-migration branch January 20, 2022 14:15

codefromthecrypt mentioned this pull request Jan 22, 2022

Updates latest Envoy to 1.21 and tidies proc.go tetratelabs/func-e#422

Merged

codefromthecrypt mentioned this pull request Jan 22, 2022

func-e 1.1.2 #93586

Closed

codefromthecrypt mentioned this pull request Apr 27, 2022

Track problems in Envoy 1.22.0 tetratelabs/archive-envoy#34

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

envoy 1.21.0 #90921

envoy 1.21.0 #90921

XuehaiPan commented Dec 10, 2021

cclauss commented Dec 10, 2021

branchvincent commented Dec 16, 2021

XuehaiPan commented Dec 16, 2021 •

edited

Loading

cclauss commented Dec 16, 2021

XuehaiPan commented Dec 17, 2021 •

edited

Loading

github-actions bot commented Jan 7, 2022

XuehaiPan commented Jan 8, 2022

cclauss commented Jan 13, 2022

XuehaiPan commented Jan 13, 2022 •

edited

Loading

XuehaiPan Jan 17, 2022 •

edited

Loading

carlocab Jan 17, 2022

iMichka Jan 17, 2022

XuehaiPan Jan 17, 2022 •

edited

Loading

XuehaiPan commented Jan 17, 2022

XuehaiPan commented Jan 19, 2022

XuehaiPan commented Jan 20, 2022

BrewTestBot commented Jan 20, 2022

branchvincent commented Jan 20, 2022

codefromthecrypt commented Jan 22, 2022

envoy 1.21.0 #90921

envoy 1.21.0 #90921

Conversation

XuehaiPan commented Dec 10, 2021

cclauss commented Dec 10, 2021

branchvincent commented Dec 16, 2021

XuehaiPan commented Dec 16, 2021 • edited Loading

cclauss commented Dec 16, 2021

XuehaiPan commented Dec 17, 2021 • edited Loading

github-actions bot commented Jan 7, 2022

XuehaiPan commented Jan 8, 2022

cclauss commented Jan 13, 2022

XuehaiPan commented Jan 13, 2022 • edited Loading

XuehaiPan Jan 17, 2022 • edited Loading

Choose a reason for hiding this comment

carlocab Jan 17, 2022

Choose a reason for hiding this comment

iMichka Jan 17, 2022

Choose a reason for hiding this comment

XuehaiPan Jan 17, 2022 • edited Loading

Choose a reason for hiding this comment

XuehaiPan commented Jan 17, 2022

XuehaiPan commented Jan 19, 2022

XuehaiPan commented Jan 20, 2022

BrewTestBot commented Jan 20, 2022

branchvincent commented Jan 20, 2022

codefromthecrypt commented Jan 22, 2022

XuehaiPan commented Dec 16, 2021 •

edited

Loading

XuehaiPan commented Dec 17, 2021 •

edited

Loading

XuehaiPan commented Jan 13, 2022 •

edited

Loading

XuehaiPan Jan 17, 2022 •

edited

Loading

XuehaiPan Jan 17, 2022 •

edited

Loading