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.

Sign up for GitHub

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

Merge stackdriver-core-dependencies feature branch to master #1162

Merged
merged 21 commits into from
Dec 21, 2016
Merged

Merge stackdriver-core-dependencies feature branch to master #1162

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bee7781
Update google-cloud-logging to use trace context tracking from core
dazuma Dec 2, 2016
ab50c20
Trace instrumentation
dazuma Oct 26, 2016
6a75b24
Frontload require of version.rb so the trace gem will load without th…
dazuma Dec 14, 2016
bbf3345
Restore (but deprecate) earlier logger API for now.
dazuma Dec 14, 2016
26ce73d
Restore doctest notice for google-cloud-trace
dazuma Dec 14, 2016
ffcf821
Basic acceptance tests for google-cloud-trace
dazuma Dec 15, 2016
d5af77d
Logger object understands all attributes supported by the stdlib Logger
dazuma Dec 15, 2016
ff10785
Cloud Logger supports all remaining stdlib Logger methods.
dazuma Dec 15, 2016
6bc5fc7
Ensure AsyncWriter threads finish on VM exit
dazuma Dec 15, 2016
5f47636
Improve Logging::Railtie activation warning messages
hxiong388 Dec 16, 2016
b1da405
Update and clarify docs for google-cloud-trace
dazuma Dec 16, 2016
4db6a30
Improve the Logger activation warning messages even more
hxiong388 Dec 17, 2016
73db861
Remove orphaned span hack from middleware, and fix conversion of orph…
dazuma Dec 17, 2016
dcc3774
Document capture_stack rails config
dazuma Dec 18, 2016
b0eb908
Best Logger activation warning messages ever!
hxiong388 Dec 19, 2016
b1c31bc
Fix examples related to thread traces
dazuma Dec 19, 2016
b83c2a6
Trace sampler interface is now just a Proc
dazuma Dec 19, 2016
d93935c
Rename to_proto/from_proto to to_grpc/from_grpc for trace models
dazuma Dec 19, 2016
8c806a8
Update docs to clarify how blacklisting and sampling work
dazuma Dec 20, 2016
eac4d89
Change proto to grpc terminology in Utils
dazuma Dec 20, 2016
7e38bc5
Update google-cloud-core dependency for logging and trace to pick up …
dazuma Dec 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve the Logger activation warning messages even more
  • Loading branch information
@hxiong388 @blowmage
hxiong388 authored and blowmage committed Dec 21, 2016
commit 4db6a30fb7961fef0424c738a3a29aeb8fa35221
4 changes: 2 additions & 2 deletions google-cloud-logging/lib/google/cloud/logging/rails.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ def self.use_logging? config
Google::Cloud::Logging::Credentials.credentials_with_scope keyfile
rescue Exception => e
warn "Unable to initialize Google::Cloud::Logging due " \
"to authorization error: #{e.message}\nFallback to default logger"
"to authorization error: #{e.message}\nFalling back to default logger"
return false
end

project_id = gcp_config.logging.project_id || gcp_config.project_id ||
Google::Cloud::Logging::Project.default_project
if project_id.to_s.empty?
warn "Google::Cloud::Logging is not activated due to empty " \
"project_id; fallback to default logger"
"project_id; falling back to default logger"
return false
end

Expand Down