google-cloud-logging 1.9.5 → 1.10.0

data/lib/google/cloud/logging/v2/doc/google/logging/v2/logging_metrics.rb

@@ -44,8 +44,8 @@ module Google
       #     The maximum length of the description is 8000 characters.
       # @!attribute [rw] filter
       #   @return [String]
-      #     Required. An [advanced logs filter](https://cloud.google.com/logging/docs/view/advanced_filters)
-      #     which is used to match log entries.
+      #     Required. An [advanced logs filter](https://cloud.google.com/logging/docs/view/advanced_filters) which is
+      #     used to match log entries.
       #     Example:
       #
       #         "resource.type=gae_app AND severity>=ERROR"

data/lib/google/cloud/logging/v2/logging_service_v2_client.rb

@@ -69,18 +69,6 @@ module Google
 
           private_constant :PAGE_DESCRIPTORS
 
-          BUNDLE_DESCRIPTORS = {
-            "write_log_entries" => Google::Gax::BundleDescriptor.new(
-              "entries",
-              [
-                "logName",
-                "resource",
-                "labels"
-              ])
-          }.freeze
-
-          private_constant :BUNDLE_DESCRIPTORS
-
           # The scopes needed to make gRPC calls to all of the methods defined in
           # this service.
           ALL_SCOPES = [
@@ -92,17 +80,11 @@ module Google
           ].freeze
 
 
-          BILLING_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
+          BILLING_ACCOUNT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
             "billingAccounts/{billing_account}"
           )
 
-          private_constant :BILLING_PATH_TEMPLATE
-
-          BILLING_LOG_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "billingAccounts/{billing_account}/logs/{log}"
-          )
-
-          private_constant :BILLING_LOG_PATH_TEMPLATE
+          private_constant :BILLING_ACCOUNT_PATH_TEMPLATE
 
           FOLDER_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
             "folders/{folder}"
@@ -110,56 +92,27 @@ module Google
 
           private_constant :FOLDER_PATH_TEMPLATE
 
-          FOLDER_LOG_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "folders/{folder}/logs/{log}"
-          )
-
-          private_constant :FOLDER_LOG_PATH_TEMPLATE
-
-          LOG_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "projects/{project}/logs/{log}"
-          )
-
-          private_constant :LOG_PATH_TEMPLATE
-
           ORGANIZATION_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
             "organizations/{organization}"
           )
 
           private_constant :ORGANIZATION_PATH_TEMPLATE
 
-          ORGANIZATION_LOG_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "organizations/{organization}/logs/{log}"
-          )
-
-          private_constant :ORGANIZATION_LOG_PATH_TEMPLATE
-
           PROJECT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
             "projects/{project}"
           )
 
           private_constant :PROJECT_PATH_TEMPLATE
 
-          # Returns a fully-qualified billing resource name string.
+          # Returns a fully-qualified billing_account resource name string.
           # @param billing_account [String]
           # @return [String]
-          def self.billing_path billing_account
-            BILLING_PATH_TEMPLATE.render(
+          def self.billing_account_path billing_account
+            BILLING_ACCOUNT_PATH_TEMPLATE.render(
               :"billing_account" => billing_account
             )
           end
 
-          # Returns a fully-qualified billing_log resource name string.
-          # @param billing_account [String]
-          # @param log [String]
-          # @return [String]
-          def self.billing_log_path billing_account, log
-            BILLING_LOG_PATH_TEMPLATE.render(
-              :"billing_account" => billing_account,
-              :"log" => log
-            )
-          end
-
           # Returns a fully-qualified folder resource name string.
           # @param folder [String]
           # @return [String]
@@ -169,28 +122,6 @@ module Google
             )
           end
 
-          # Returns a fully-qualified folder_log resource name string.
-          # @param folder [String]
-          # @param log [String]
-          # @return [String]
-          def self.folder_log_path folder, log
-            FOLDER_LOG_PATH_TEMPLATE.render(
-              :"folder" => folder,
-              :"log" => log
-            )
-          end
-
-          # Returns a fully-qualified log resource name string.
-          # @param project [String]
-          # @param log [String]
-          # @return [String]
-          def self.log_path project, log
-            LOG_PATH_TEMPLATE.render(
-              :"project" => project,
-              :"log" => log
-            )
-          end
-
           # Returns a fully-qualified organization resource name string.
           # @param organization [String]
           # @return [String]
@@ -200,17 +131,6 @@ module Google
             )
           end
 
-          # Returns a fully-qualified organization_log resource name string.
-          # @param organization [String]
-          # @param log [String]
-          # @return [String]
-          def self.organization_log_path organization, log
-            ORGANIZATION_LOG_PATH_TEMPLATE.render(
-              :"organization" => organization,
-              :"log" => log
-            )
-          end
-
           # Returns a fully-qualified project resource name string.
           # @param project [String]
           # @return [String]
@@ -297,6 +217,9 @@ module Google
             google_api_client.freeze
 
             headers = { :"x-goog-api-client" => google_api_client }
+            if credentials.respond_to?(:quota_project_id) && credentials.quota_project_id
+              headers[:"x-goog-user-project"] = credentials.quota_project_id
+            end
             headers.merge!(metadata) unless metadata.nil?
             client_config_file = Pathname.new(__dir__).join(
               "logging_service_v2_client_config.json"
@@ -308,7 +231,6 @@ module Google
                 client_config,
                 Google::Gax::Grpc::STATUS_CODE_NAMES,
                 timeout,
-                bundle_descriptors: BUNDLE_DESCRIPTORS,
                 page_descriptors: PAGE_DESCRIPTORS,
                 errors: Google::Gax::Grpc::API_ERRORS,
                 metadata: headers
@@ -394,8 +316,10 @@ module Google
           #   require "google/cloud/logging/v2"
           #
           #   logging_client = Google::Cloud::Logging::V2::LoggingServiceV2Client.new
-          #   formatted_log_name = Google::Cloud::Logging::V2::LoggingServiceV2Client.log_path("[PROJECT]", "[LOG]")
-          #   logging_client.delete_log(formatted_log_name)
+          #
+          #   # TODO: Initialize `log_name`:
+          #   log_name = ''
+          #   logging_client.delete_log(log_name)
 
           def delete_log \
               log_name,
@@ -457,10 +381,10 @@ module Google
           #       "projects/my-project-id/logs/syslog"
           #       "organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"
           #
-          #   The permission <code>logging.logEntries.create</code> is needed on each
-          #   project, organization, billing account, or folder that is receiving
-          #   new log entries, whether the resource is specified in
-          #   <code>logName</code> or in an individual log entry.
+          #   The permission `logging.logEntries.create` is needed on each project,
+          #   organization, billing account, or folder that is receiving new log
+          #   entries, whether the resource is specified in `logName` or in an
+          #   individual log entry.
           # @param resource [Google::Api::MonitoredResource | Hash]
           #   Optional. A default monitored resource object that is assigned to all log
           #   entries in `entries` that do not specify a value for `resource`. Example:
@@ -540,10 +464,6 @@ module Google
           #
           #
           #   Projects listed in the `project_ids` field are added to this list.
-          # @param project_ids [Array<String>]
-          #   Deprecated. Use `resource_names` instead.  One or more project identifiers
-          #   or project numbers from which to retrieve log entries.  Example:
-          #   `"my-project-1A"`.
           # @param filter [String]
           #   Optional. A filter that chooses which log entries to return.  See [Advanced
           #   Logs Queries](/logging/docs/view/advanced-queries).  Only log entries that
@@ -600,7 +520,6 @@ module Google
 
           def list_log_entries \
               resource_names,
-              project_ids: nil,
               filter: nil,
               order_by: nil,
               page_size: nil,
@@ -608,7 +527,6 @@ module Google
               &block
             req = {
               resource_names: resource_names,
-              project_ids: project_ids,
               filter: filter,
               order_by: order_by,
               page_size: page_size

data/lib/google/cloud/logging/v2/logging_service_v2_client_config.json

@@ -4,7 +4,6 @@
       "retry_codes": {
         "idempotent": [
           "DEADLINE_EXCEEDED",
-          "INTERNAL",
           "UNAVAILABLE"
         ],
         "non_idempotent": []
@@ -18,36 +17,22 @@
           "rpc_timeout_multiplier": 1.0,
           "max_rpc_timeout_millis": 20000,
           "total_timeout_millis": 600000
-        },
-        "list": {
-          "initial_retry_delay_millis": 100,
-          "retry_delay_multiplier": 1.3,
-          "max_retry_delay_millis": 60000,
-          "initial_rpc_timeout_millis": 20000,
-          "rpc_timeout_multiplier": 1.0,
-          "max_rpc_timeout_millis": 20000,
-          "total_timeout_millis": 600000
         }
       },
       "methods": {
         "DeleteLog": {
           "timeout_millis": 60000,
-          "retry_codes_name": "idempotent",
+          "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         },
         "WriteLogEntries": {
           "timeout_millis": 60000,
-          "retry_codes_name": "idempotent",
-          "retry_params_name": "default",
-          "bundling": {
-            "element_count_threshold": 1000,
-            "request_byte_threshold": 1048576,
-            "delay_threshold_millis": 50
-          }
+          "retry_codes_name": "non_idempotent",
+          "retry_params_name": "default"
         },
         "ListLogEntries": {
           "timeout_millis": 10000,
-          "retry_codes_name": "idempotent",
+          "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         },
         "ListMonitoredResourceDescriptors": {

data/lib/google/cloud/logging/v2/metrics_service_v2_client.rb

@@ -72,29 +72,11 @@ module Google
           ].freeze
 
 
-          BILLING_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "billingAccounts/{billing_account}"
-          )
-
-          private_constant :BILLING_PATH_TEMPLATE
-
-          FOLDER_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "folders/{folder}"
-          )
-
-          private_constant :FOLDER_PATH_TEMPLATE
-
-          METRIC_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
+          LOG_METRIC_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
             "projects/{project}/metrics/{metric}"
           )
 
-          private_constant :METRIC_PATH_TEMPLATE
-
-          ORGANIZATION_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
-            "organizations/{organization}"
-          )
-
-          private_constant :ORGANIZATION_PATH_TEMPLATE
+          private_constant :LOG_METRIC_PATH_TEMPLATE
 
           PROJECT_PATH_TEMPLATE = Google::Gax::PathTemplate.new(
             "projects/{project}"
@@ -102,44 +84,17 @@ module Google
 
           private_constant :PROJECT_PATH_TEMPLATE
 
-          # Returns a fully-qualified billing resource name string.
-          # @param billing_account [String]
-          # @return [String]
-          def self.billing_path billing_account
-            BILLING_PATH_TEMPLATE.render(
-              :"billing_account" => billing_account
-            )
-          end
-
-          # Returns a fully-qualified folder resource name string.
-          # @param folder [String]
-          # @return [String]
-          def self.folder_path folder
-            FOLDER_PATH_TEMPLATE.render(
-              :"folder" => folder
-            )
-          end
-
-          # Returns a fully-qualified metric resource name string.
+          # Returns a fully-qualified log_metric resource name string.
           # @param project [String]
           # @param metric [String]
           # @return [String]
-          def self.metric_path project, metric
-            METRIC_PATH_TEMPLATE.render(
+          def self.log_metric_path project, metric
+            LOG_METRIC_PATH_TEMPLATE.render(
               :"project" => project,
               :"metric" => metric
             )
           end
 
-          # Returns a fully-qualified organization resource name string.
-          # @param organization [String]
-          # @return [String]
-          def self.organization_path organization
-            ORGANIZATION_PATH_TEMPLATE.render(
-              :"organization" => organization
-            )
-          end
-
           # Returns a fully-qualified project resource name string.
           # @param project [String]
           # @return [String]
@@ -226,6 +181,9 @@ module Google
             google_api_client.freeze
 
             headers = { :"x-goog-api-client" => google_api_client }
+            if credentials.respond_to?(:quota_project_id) && credentials.quota_project_id
+              headers[:"x-goog-user-project"] = credentials.quota_project_id
+            end
             headers.merge!(metadata) unless metadata.nil?
             client_config_file = Pathname.new(__dir__).join(
               "metrics_service_v2_client_config.json"
@@ -376,7 +334,7 @@ module Google
           #   require "google/cloud/logging/v2"
           #
           #   metrics_client = Google::Cloud::Logging::V2::MetricsServiceV2Client.new
-          #   formatted_metric_name = Google::Cloud::Logging::V2::MetricsServiceV2Client.metric_path("[PROJECT]", "[METRIC]")
+          #   formatted_metric_name = Google::Cloud::Logging::V2::MetricsServiceV2Client.log_metric_path("[PROJECT]", "[METRIC]")
           #   response = metrics_client.get_log_metric(formatted_metric_name)
 
           def get_log_metric \
@@ -460,7 +418,7 @@ module Google
           #   require "google/cloud/logging/v2"
           #
           #   metrics_client = Google::Cloud::Logging::V2::MetricsServiceV2Client.new
-          #   formatted_metric_name = Google::Cloud::Logging::V2::MetricsServiceV2Client.metric_path("[PROJECT]", "[METRIC]")
+          #   formatted_metric_name = Google::Cloud::Logging::V2::MetricsServiceV2Client.log_metric_path("[PROJECT]", "[METRIC]")
           #
           #   # TODO: Initialize `metric`:
           #   metric = {}
@@ -496,7 +454,7 @@ module Google
           #   require "google/cloud/logging/v2"
           #
           #   metrics_client = Google::Cloud::Logging::V2::MetricsServiceV2Client.new
-          #   formatted_metric_name = Google::Cloud::Logging::V2::MetricsServiceV2Client.metric_path("[PROJECT]", "[METRIC]")
+          #   formatted_metric_name = Google::Cloud::Logging::V2::MetricsServiceV2Client.log_metric_path("[PROJECT]", "[METRIC]")
           #   metrics_client.delete_log_metric(formatted_metric_name)
 
           def delete_log_metric \

data/lib/google/cloud/logging/v2/metrics_service_v2_client_config.json

@@ -4,7 +4,6 @@
       "retry_codes": {
         "idempotent": [
           "DEADLINE_EXCEEDED",
-          "INTERNAL",
           "UNAVAILABLE"
         ],
         "non_idempotent": []
@@ -38,12 +37,12 @@
         },
         "UpdateLogMetric": {
           "timeout_millis": 60000,
-          "retry_codes_name": "idempotent",
+          "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         },
         "DeleteLogMetric": {
           "timeout_millis": 60000,
-          "retry_codes_name": "idempotent",
+          "retry_codes_name": "non_idempotent",
           "retry_params_name": "default"
         }
       }

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

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

data/lib/google/logging/v2/log_entry_pb.rb

@@ -4,6 +4,7 @@
 
 require 'google/protobuf'
 
+require 'google/api/field_behavior_pb'
 require 'google/api/monitored_resource_pb'
 require 'google/api/resource_pb'
 require 'google/logging/type/http_request_pb'
@@ -23,7 +24,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :insert_id, :string, 4
     optional :http_request, :message, 7, "google.logging.type.HttpRequest"
     map :labels, :string, :string, 11
-    optional :metadata, :message, 25, "google.api.MonitoredResourceMetadata"
     optional :operation, :message, 15, "google.logging.v2.LogEntryOperation"
     optional :trace, :string, 22
     optional :span_id, :string, 27

data/lib/google/logging/v2/logging_config_pb.rb

@@ -13,6 +13,14 @@ require 'google/protobuf/field_mask_pb'
 require 'google/protobuf/timestamp_pb'
 require 'google/api/annotations_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_message "google.logging.v2.LogBucket" do
+    optional :name, :string, 1
+    optional :description, :string, 3
+    optional :create_time, :message, 4, "google.protobuf.Timestamp"
+    optional :update_time, :message, 5, "google.protobuf.Timestamp"
+    optional :retention_days, :int32, 11
+    optional :lifecycle_state, :enum, 12, "google.logging.v2.LifecycleState"
+  end
   add_message "google.logging.v2.LogSink" do
     optional :name, :string, 1
     optional :destination, :string, 3
@@ -24,8 +32,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :include_children, :bool, 9
     optional :create_time, :message, 13, "google.protobuf.Timestamp"
     optional :update_time, :message, 14, "google.protobuf.Timestamp"
-    optional :start_time, :message, 10, "google.protobuf.Timestamp"
-    optional :end_time, :message, 11, "google.protobuf.Timestamp"
     oneof :options do
       optional :bigquery_options, :message, 12, "google.logging.v2.BigQueryOptions"
     end
@@ -39,6 +45,23 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :use_partitioned_tables, :bool, 1
     optional :uses_timestamp_column_partitioning, :bool, 3
   end
+  add_message "google.logging.v2.ListBucketsRequest" do
+    optional :parent, :string, 1
+    optional :page_token, :string, 2
+    optional :page_size, :int32, 3
+  end
+  add_message "google.logging.v2.ListBucketsResponse" do
+    repeated :buckets, :message, 1, "google.logging.v2.LogBucket"
+    optional :next_page_token, :string, 2
+  end
+  add_message "google.logging.v2.UpdateBucketRequest" do
+    optional :name, :string, 1
+    optional :bucket, :message, 2, "google.logging.v2.LogBucket"
+    optional :update_mask, :message, 4, "google.protobuf.FieldMask"
+  end
+  add_message "google.logging.v2.GetBucketRequest" do
+    optional :name, :string, 1
+  end
   add_message "google.logging.v2.ListSinksRequest" do
     optional :parent, :string, 1
     optional :page_token, :string, 2
@@ -110,14 +133,24 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :kms_key_name, :string, 2
     optional :service_account_id, :string, 3
   end
+  add_enum "google.logging.v2.LifecycleState" do
+    value :LIFECYCLE_STATE_UNSPECIFIED, 0
+    value :ACTIVE, 1
+    value :DELETE_REQUESTED, 2
+  end
 end
 
 module Google
   module Logging
     module V2
+      LogBucket = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.LogBucket").msgclass
       LogSink = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.LogSink").msgclass
       LogSink::VersionFormat = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.LogSink.VersionFormat").enummodule
       BigQueryOptions = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.BigQueryOptions").msgclass
+      ListBucketsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.ListBucketsRequest").msgclass
+      ListBucketsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.ListBucketsResponse").msgclass
+      UpdateBucketRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.UpdateBucketRequest").msgclass
+      GetBucketRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.GetBucketRequest").msgclass
       ListSinksRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.ListSinksRequest").msgclass
       ListSinksResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.ListSinksResponse").msgclass
       GetSinkRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.GetSinkRequest").msgclass
@@ -134,6 +167,7 @@ module Google
       GetCmekSettingsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.GetCmekSettingsRequest").msgclass
       UpdateCmekSettingsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.UpdateCmekSettingsRequest").msgclass
       CmekSettings = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.CmekSettings").msgclass
+      LifecycleState = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.logging.v2.LifecycleState").enummodule
     end
   end
 end