google-cloud-logging 1.4.0 → 1.5.0

data/lib/google/cloud/logging/rails.rb

@@ -59,14 +59,14 @@ module Google
         # insert the Middleware.
         def self.init_middleware app
           project_id = Logging.configure.project_id
-          keyfile = Logging.configure.keyfile
+          credentials = Logging.configure.credentials
           resource_type = Logging.configure.monitored_resource.type
           resource_labels = Logging.configure.monitored_resource.labels
           log_name = Logging.configure.log_name
           labels = Logging.configure.labels
 
-          logging = Google::Cloud::Logging.new project: project_id,
-                                               keyfile: keyfile
+          logging = Google::Cloud::Logging.new project_id: project_id,
+                                               credentials: credentials
           resource =
             Logging::Middleware.build_monitored_resource resource_type,
                                                          resource_labels
@@ -112,27 +112,30 @@ module Google
         # configuration.
         def self.merge_rails_config rails_config # rubocop:disable AbcSize
           gcp_config = rails_config.google_cloud
-          logging_config = gcp_config.logging
+          log_config = gcp_config.logging
 
           Cloud.configure.use_logging ||= gcp_config.use_logging
           Logging.configure do |config|
-            config.project_id ||= logging_config.project_id ||
-                                  gcp_config.project_id
-            config.keyfile ||= logging_config.keyfile || gcp_config.keyfile
-            config.log_name ||= logging_config.log_name
-            config.labels ||= logging_config.labels
-            config.log_name_map ||= logging_config.log_name_map
+            config.project_id ||= config.project
+            config.project_id ||= log_config.project_id || log_config.project
+            config.project_id ||= gcp_config.project_id || gcp_config.project
+            config.credentials ||= config.keyfile
+            config.credentials ||= log_config.credentials || log_config.keyfile
+            config.credentials ||= gcp_config.credentials || gcp_config.keyfile
+            config.log_name ||= log_config.log_name
+            config.labels ||= log_config.labels
+            config.log_name_map ||= log_config.log_name_map
             config.monitored_resource.type ||=
-              logging_config.monitored_resource.type
+              log_config.monitored_resource.type
             config.monitored_resource.labels ||=
-              logging_config.monitored_resource.labels.to_h
+              log_config.monitored_resource.labels.to_h
           end
         end
 
         ##
         # Fallback to default config values if config parameters not provided.
         def self.init_default_config
-          Logging.configure.project_id ||= Logging::Project.default_project_id
+          Logging.configure.project_id ||= Logging.default_project_id
           Logging.configure.log_name ||= Middleware::DEFAULT_LOG_NAME
         end
 

data/lib/google/cloud/logging/resource_descriptor/list.rb

@@ -73,7 +73,8 @@ module Google
             return nil unless next?
             ensure_service!
             list_grpc = @service.list_resource_descriptors(
-              token: token, max: @max)
+              token: token, max: @max
+            )
             self.class.from_grpc list_grpc, @service
           end
 
@@ -165,7 +166,7 @@ module Google
           ##
           # Raise an error unless an active service is available.
           def ensure_service!
-            fail "Must have active service" unless @service
+            raise "Must have active service" unless @service
           end
         end
       end

data/lib/google/cloud/logging/service.rb

@@ -44,7 +44,8 @@ module Google
               timeout: timeout,
               client_config: client_config,
               lib_name: "gccl",
-              lib_version: Google::Cloud::Logging::VERSION)
+              lib_version: Google::Cloud::Logging::VERSION
+            )
         end
         attr_accessor :mocked_logging
 
@@ -56,7 +57,8 @@ module Google
               timeout: timeout,
               client_config: client_config,
               lib_name: "gccl",
-              lib_version: Google::Cloud::Logging::VERSION)
+              lib_version: Google::Cloud::Logging::VERSION
+            )
         end
         attr_accessor :mocked_sinks
 
@@ -68,7 +70,8 @@ module Google
               timeout: timeout,
               client_config: client_config,
               lib_name: "gccl",
-              lib_version: Google::Cloud::Logging::VERSION)
+              lib_version: Google::Cloud::Logging::VERSION
+            )
         end
         attr_accessor :mocked_metrics
 
@@ -158,13 +161,9 @@ module Google
           end
         end
 
-        def create_sink name, destination, filter, version, start_time: nil,
-                        end_time: nil, unique_writer_identity: nil
+        def create_sink name, destination, filter, unique_writer_identity: nil
           sink = Google::Logging::V2::LogSink.new({
-            name: name, destination: destination, filter: filter,
-            output_version_format: version,
-            start_time: time_to_timestamp(start_time),
-            end_time: time_to_timestamp(end_time)
+            name: name, destination: destination, filter: filter
           }.delete_if { |_, v| v.nil? })
 
           execute do
@@ -178,13 +177,12 @@ module Google
           execute { sinks.get_sink sink_path(name), options: default_options }
         end
 
-        def update_sink name, destination, filter, version, start_time: nil,
-                        end_time: nil, unique_writer_identity: nil
-          sink = Google::Logging::V2::LogSink.new({
-            name: name, destination: destination, filter: filter,
-            output_version_format: version,
-            start_time: time_to_timestamp(start_time),
-            end_time: time_to_timestamp(end_time) }.delete_if { |_, v| v.nil? })
+        def update_sink name, destination, filter, unique_writer_identity: nil
+          sink = Google::Logging::V2::LogSink.new(
+            {
+              name: name, destination: destination, filter: filter
+            }.delete_if { |_, v| v.nil? }
+          )
 
           execute do
             sinks.update_sink sink_path(name), sink,
@@ -214,9 +212,10 @@ module Google
         end
 
         def create_metric name, filter, description
-          metric = Google::Logging::V2::LogMetric.new({
-            name: name, description: description,
-            filter: filter }.delete_if { |_, v| v.nil? })
+          metric = Google::Logging::V2::LogMetric.new(
+            { name: name, description: description,
+              filter: filter }.delete_if { |_, v| v.nil? }
+          )
 
           execute do
             metrics.create_log_metric project_path, metric,
@@ -231,9 +230,10 @@ module Google
         end
 
         def update_metric name, description, filter
-          metric = Google::Logging::V2::LogMetric.new({
-            name: name, description: description,
-            filter: filter }.delete_if { |_, v| v.nil? })
+          metric = Google::Logging::V2::LogMetric.new(
+            { name: name, description: description,
+              filter: filter }.delete_if { |_, v| v.nil? }
+          )
 
           execute do
             metrics.update_log_metric metric_path(name), metric,

data/lib/google/cloud/logging/sink.rb

@@ -122,76 +122,101 @@ module Google
         end
 
         ##
-        # The log entry version used when exporting log entries from this sink.
-        # This version does not have to correspond to the version of the log
-        # entry when it was written to Stackdriver Logging.
+        # **Deprecated.** The log entry version used when exporting log entries
+        # from this sink. This version does not have to correspond to the
+        # version of the log entry when it was written to Stackdriver Logging.
+        #
+        # @deprecated The v2 format is used by default and cannot be changed.
         def version
-          @grpc.output_version_format
+          warn "[DEPRECATION] version is deprecated."
+          :V2
         end
 
         ##
-        # Updates the log entry version used when exporting log entries from
-        # this sink. This version does not have to correspond to the version of
-        # the log entry when it was written to Stackdriver Logging. Accepted
-        # values are `:VERSION_FORMAT_UNSPECIFIED`, `:V2`, and `:V1`.
-        def version= version
-          @grpc.output_version_format = self.class.resolve_version(version)
+        # **Deprecated.** Updates the log entry version used when exporting log
+        # entries from this sink. This version does not have to correspond to
+        # the version of the log entry when it was written to Stackdriver
+        # Logging. Accepted values are `:VERSION_FORMAT_UNSPECIFIED`, `:V2`, and
+        # `:V1`.
+        #
+        # @deprecated The v2 format is used by default and cannot be changed.
+        def version= _version
+          warn "[DEPRECATION] version= is deprecated and will be ignored."
         end
 
         ##
         # Helper to determine if the sink's version is
         # `VERSION_FORMAT_UNSPECIFIED`.
+        #
+        # @deprecated The v2 format is used by default and cannot be changed.
         def unspecified?
-          !(v1? || v2?)
+          warn "[DEPRECATION] unspecified? is deprecated."
+          false
         end
 
         ##
         # Helper to determine if the sink's version is `V2`.
+        #
+        # @deprecated The v2 format is used by default and cannot be changed.
         def v2?
-          version == :V2
+          warn "[DEPRECATION] v2? is deprecated."
+          true
         end
 
         ##
         # Helper to determine if the sink's version is `V1`.
+        #
+        # @deprecated The v2 format is used by default and cannot be changed.
         def v1?
-          version == :V1
+          warn "[DEPRECATION] v1? is deprecated."
+          false
         end
 
         ##
-        # The time at which this sink will begin exporting log entries. If this
-        # value is present, then log entries are exported only if `start_at`
-        # is less than the log entry's timestamp. Optional.
+        # **Deprecated.** The time at which this sink will begin exporting log
+        # entries. If this value is present, then log entries are exported only
+        # if `start_at` is less than the log entry's timestamp. Optional.
+        #
+        # @deprecated This field is ignored when creating or updating sinks.
         def start_at
-          timestamp_to_time @grpc.start_time
+          warn "[DEPRECATION] start_at is deprecated."
+          nil
         end
-        alias_method :start_time, :start_at
+        alias start_time start_at
 
         ##
-        # Sets the time at which this sink will begin exporting log entries. If
-        # this value is present, then log entries are exported only if
-        # `start_at` is less than the log entry's timestamp. Optional.
-        def start_at= new_start_at
-          @grpc.start_time = time_to_timestamp new_start_at
+        # **Deprecated.** Sets the time at which this sink will begin exporting
+        # log entries. If this value is present, then log entries are exported
+        # only if `start_at` is less than the log entry's timestamp. Optional.
+        #
+        # @deprecated This field is ignored when creating or updating sinks.
+        def start_at= _new_start_at
+          warn "[DEPRECATION] start_at= is deprecated and will be ignored."
         end
-        alias_method :start_time=, :start_at=
+        alias start_time= start_at=
 
         ##
-        # Time at which this sink will stop exporting log entries. If this
-        # value is present, then log entries are exported only if the log
-        # entry's timestamp is less than `end_at`. Optional.
+        # **Deprecated.** Time at which this sink will stop exporting log
+        # entries. If this value is present, then log entries are exported only
+        # if the log entry's timestamp is less than `end_at`. Optional.
+        #
+        # @deprecated This field is ignored when creating or updating sinks.
         def end_at
-          timestamp_to_time @grpc.end_time
+          warn "[DEPRECATION] end_at is deprecated."
+          nil
         end
-        alias_method :end_time, :end_at
+        alias end_time end_at
 
         ##
-        # Sets the time at which this sink will stop exporting log entries. If
-        # this value is present, then log entries are exported only if the log
-        # entry's timestamp is less than `end_at`. Optional.
-        def end_at= new_end_at
-          @grpc.end_time = time_to_timestamp new_end_at
+        # **Deprecated.** Sets the time at which this sink will stop exporting
+        # log entries. If this value is present, then log entries are exported
+        # only if the log entry's timestamp is less than `end_at`. Optional.
+        #
+        # @deprecated This field is ignored when creating or updating sinks.
+        def end_at= _new_end_at
+          warn "[DEPRECATION] end_at= is deprecated and will be ignored."
         end
-        alias_method :end_time=, :end_at=
+        alias end_time= end_at=
 
         ##
         # An IAM identity (a service account or group) that will write exported
@@ -224,8 +249,7 @@ module Google
         def save unique_writer_identity: nil
           ensure_service!
           @grpc = service.update_sink \
-            name, destination, filter, version,
-            start_time: start_at, end_time: end_at,
+            name, destination, filter,
             unique_writer_identity: unique_writer_identity
         end
 
@@ -236,7 +260,7 @@ module Google
           ensure_service!
           @grpc = service.get_sink name
         end
-        alias_method :refresh!, :reload!
+        alias refresh! reload!
 
         ##
         # Permanently deletes the logs-based sink.
@@ -265,23 +289,13 @@ module Google
           end
         end
 
-        ##
-        # @private Convert a version value to the gRPC enum value.
-        def self.resolve_version version
-          ver = version.to_s.upcase.to_sym
-          ver = Google::Logging::V2::LogSink::VersionFormat.resolve ver
-          return ver if ver
-          Google::Logging::V2::LogSink::VersionFormat:: \
-            VERSION_FORMAT_UNSPECIFIED
-        end
-
         protected
 
         ##
         # @private Raise an error unless an active connection to the service is
         # available.
         def ensure_service!
-          fail "Must have active connection to service" unless service
+          raise "Must have active connection to service" unless service
         end
 
         ##

data/lib/google/cloud/logging/sink/list.rb

@@ -159,7 +159,7 @@ module Google
           ##
           # Raise an error unless an active service is available.
           def ensure_service!
-            fail "Must have active service" unless @service
+            raise "Must have active service" unless @service
           end
         end
       end

data/lib/google/cloud/logging/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Logging
-      VERSION = "1.4.0"
+      VERSION = "1.5.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-logging
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: stackdriver-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: google-gax
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +127,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API Client library for Stackdriver Logging