Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows compilation: expected_span_name is not captured by the lambda with MSVC #10934

Merged
merged 2 commits into from
Apr 24, 2020
Merged

Windows compilation: expected_span_name is not captured by the lambda with MSVC #10934

merged 2 commits into from
Apr 24, 2020

Conversation

sunjayBhatia
Copy link
Member

Commit Message: Ensure expected_span_name is captured by lamda with MSVC
Additional Description: MSVC's lambda capture rules are more strict, it seems in this case this variable has to be explicitly captured or captured with the capture default
Risk Level: Low
Testing: N/A
Docs Changes: N/A
Release Notes: N/A

Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
@sunjayBhatia
Copy link
Member Author

If it is more desirable to explicitly capture the variable, I can make that change, just used the capture default since it was less verbose and wouldn't cause future breakages

@mattklein123
Copy link
Member

This line has changed back and forth several times. Can you work with @marcomagdy to figure out the path forward here? Also, until we run the tests in Windows CI I'm not sure it makes sense to keep fixing small things like this.

@sunjayBhatia
Copy link
Member Author

sunjayBhatia commented Apr 24, 2020

@marcomagdy is the lambda change here a consequence of something that fixes coverage or potentially a merge conflict resolution issue: 5dcfa7b#diff-4d36e44b2a9f6b2cde56e3832154d528 (seems like the latter)

Copy link
Contributor

@marcomagdy marcomagdy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. It flipped because of merge conflict. Thanks for fixing it.

@mattklein123 mattklein123 self-assigned this Apr 24, 2020
@mattklein123
Copy link
Member

Please merge master to fix CI.

/wait

…acer-test-compilation

Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
@sunjayBhatia
Copy link
Member Author

@mattklein123 regarding your point about CI: agreed, these small fixes seem to be occurring less and less often while we work to get CI going with larger workers/RBE etc. but we can batch them up more while we're working to get tests passing, it was not a great time catching up when we had a huge batch of compilation issues to sort out so we've just been trying to avoid that again

@mattklein123 mattklein123 merged commit 72904d1 into envoyproxy:master Apr 24, 2020
spenceral added a commit to spenceral/envoy that referenced this pull request Apr 27, 2020
Signed-off-by: Spencer Lewis <slewis@squareup.com>

* master:
  fault injection: add support for setting gRPC status (envoyproxy#10841)
  tests: tag tests that fail on Windows with fails_on_windows (envoyproxy#10940)
  Fix typo on Postgres Proxy documentation. (envoyproxy#10930)
  fuzz: improve header/data stop/continue modeling in HCM fuzzer. (envoyproxy#10931)
  gzip filter: allow setting zlib compressor's chunk size (envoyproxy#10508)
  http: replace vector/reserve with InlinedVector in codec helper (envoyproxy#10941)
  stats: add utilities to create stats from a vector of tokens, mixing dynamic and symbolic elements. (envoyproxy#10735)
  hcm: avoid invoking 100-continue handling on decode filter. (envoyproxy#10929)
  prometheus stats: Correctly group lines of the same metric name. (envoyproxy#10833)
  status: Fix ASAN error in Status payload handling (envoyproxy#10906)
  path: Fix merge slash for paths ending with slash and present query args (envoyproxy#10922)
  compressor filter: add benchmark (envoyproxy#10464)
  xray: expected_span_name is not captured by the lambda with MSVC (envoyproxy#10934)
  ci: update before purge in cleanup (envoyproxy#10938)
  tracer: Improve test coverage for x-ray (envoyproxy#10890)
  Revert "init: order dynamic resource initialization to make RTDS always be first (envoyproxy#10362)" (envoyproxy#10919)
@sunjayBhatia sunjayBhatia deleted the windows-fix-xray-tracer-test-compilation branch May 8, 2020 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants