Skip to content

build: Change namespace of chromium_url.#6506

Merged
mattklein123 merged 2 commits intoenvoyproxy:masterfrom
jamessynge:chromium_url
Apr 8, 2019
Merged

build: Change namespace of chromium_url.#6506
mattklein123 merged 2 commits intoenvoyproxy:masterfrom
jamessynge:chromium_url

Conversation

@jamessynge
Copy link
Contributor

@jamessynge jamessynge commented Apr 7, 2019

Rename namespace url to chromium_url. Avoids link-time collisions
in binaries which link in Envoy and the original chromium URL
library.

Fix format of chromium_url/README.md.

Signed-off-by: James Synge jamessynge@google.com

Rename namespace url to chromium_url. Avoids link-time collisions
in binaries which link in Envoy and the original chromium URL
library.

Fix format of chromium_url/README.md

Signed-off-by: James Synge <jamessynge@google.com>
@jamessynge
Copy link
Contributor Author

Several currently open PRs have the same test failure during the coverage run, so I'm guessing that the test itself is flaky

[ RUN      ] SslIpVersionsClientType/GrpcSslClientIntegrationTest.BasicSslRequestWithClientCert/IPv4_EnvoyGrpc
unknown file: Failure

Unexpected mock function call - returning directly.
    Function call: setTag(@0x1a969cc0 "grpc.status_code", @0x7ffeda5903d0 "14")
Google Mock tried the following 2 expectations, but none matched:

./test/common/grpc/grpc_client_integration_test_harness.h:352: tried expectation #0: EXPECT_CALL(*request->child_span_, setTag(Tracing::Tags::get().UpstreamCluster, fake_cluster_name_))...
  Expected arg #0: is equal to "upstream_cluster"
           Actual: "grpc.status_code"
  Expected arg #1: is equal to "fake_cluster"
           Actual: "14"
         Expected: to be called once
           Actual: called once - saturated and active
./test/common/grpc/grpc_client_integration_test_harness.h:354: tried expectation #1: EXPECT_CALL(*request->child_span_, setTag(Tracing::Tags::get().Component, Tracing::Tags::get().Proxy))...
  Expected arg #0: is equal to "component"
           Actual: "grpc.status_code"
  Expected arg #1: is equal to "proxy"
           Actual: "14"
         Expected: to be called once
           Actual: called once - saturated and active
unknown file: Failure
...

Signed-off-by: James Synge <jamessynge@google.com>
Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

Thanks!

@htuch htuch self-assigned this Apr 7, 2019
@mattklein123 mattklein123 merged commit 8cef5e3 into envoyproxy:master Apr 8, 2019
mpuncel added a commit to mpuncel/envoy that referenced this pull request Apr 8, 2019
* master: (137 commits)
  test: router upstream log to v2 config stubs (envoyproxy#6499)
  remove idle timeout validation (envoyproxy#6500)
  build: Change namespace of chromium_url. (envoyproxy#6506)
  coverage: exclude chromium_url (envoyproxy#6498)
  fix(tracing): allow 256 chars in path tag (envoyproxy#6492)
  Common: Introduce StopAllIteration filter status for decoding and encoding filters (envoyproxy#5954)
  build: update PGV url (envoyproxy#6495)
  subset lb: avoid partitioning host lists on worker threads (envoyproxy#6302)
  ci: Make envoy_select_quiche no-op. (envoyproxy#6393)
  watcher: notify when watched files are modified (envoyproxy#6215)
  stat: Add counterFromStatName(), gaugeFromStatName(), and histogramFromStatName() (envoyproxy#6475)
  bump to 1.11.0-dev (envoyproxy#6490)
  release: bump to 1.10.0 (envoyproxy#6489)
  hcm: path normalization. (#1)
  build: import manually minified Chrome URL lib. (envoyproxy#3)
  codec: reject embedded NUL in headers. (envoyproxy#2)
  Added veryfication if path contains query params and add them to path header (envoyproxy#6466)
  redis: basic integration test for redis_proxy (envoyproxy#6450)
  stats: report sample count as an integer to prevent loss of precision (envoyproxy#6274)
  Added VHDS protobuf message and updated RouteConfig to include it. (envoyproxy#6418)
  ...

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
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