Skip to content

Commit

Permalink
Make Generate and fix tests
Browse files Browse the repository at this point in the history
Signed-off-by: Tenshin Higashi <[email protected]>
  • Loading branch information
tenshinhigashi committed Dec 28, 2023
1 parent 299ce55 commit 38d076c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ libraries:

Name Version License(s)
---- ------- ----------
Cython 0.29.36 Apache License 2.0
Cython 0.29.37 Apache License 2.0
Flask 3.0.0 3-clause BSD license
Jinja2 3.1.2 3-clause BSD license
MarkupSafe 2.1.3 3-clause BSD license
Expand Down
4 changes: 2 additions & 2 deletions python/ambassador/envoy/v3/v3listener.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,7 @@ def json_helper(self) -> Any:
if tracing_config and tracing_config.driver == "envoy.tracers.datadog":
log_format["dd.trace_id"] = "%REQ(X-DATADOG-TRACE-ID)%"
log_format["dd.span_id"] = "%REQ(X-DATADOG-PARENT-ID)%"

return log_format
return log_format

# access_log constructs the access_log configuration for this V3Listener
def access_log(self) -> List[dict]:
Expand Down Expand Up @@ -434,6 +433,7 @@ def access_log(self) -> List[dict]:
},
}
)

# Use sane access log spec in Typed JSON
elif self.config.ir.ambassador_module.envoy_log_type.lower() == "typed_json":
log_format = V3Listener.json_helper(self)
Expand Down

0 comments on commit 38d076c

Please sign in to comment.