temporalio 0.2.0-arm64-darwin → 0.4.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85e9742c3972195738939eed7be5d8fdd907414f534399f863df2df9f65f048b
-  data.tar.gz: 69e2e7aec3c673928ca75599d8a900834553b18d84e19c41d5035f0d402106dc
+  metadata.gz: 4a71ac59892867ee498d5b736f357b1e691f46da82b9ddbeadafb0e75a1b3296
+  data.tar.gz: ca0a790947f671ecf638f4f403346fe43350f3152d6449e956595bfe2ee9b9a0
 SHA512:
-  metadata.gz: 1b3e7cc7b38534cd5d3297238706167ca9d1f4637bf55eab2d92b2ba361c71fd4dfc38877907dafb63b987c207dcf43f41fb02b80c3bfee749da290ebfdf96ff
-  data.tar.gz: 9de54048ace1235d180b4789bd733829bef3951a7426a41dde3986c2fddb928e1d9ba68664a11a81a4883f5ef783c766f231096ef869ed7f8d5267451fa86491
+  metadata.gz: 49b168ccae5c9fa63d9308aa66b55b9505a2b872da802298c5d2924dac01c4caef7f9432a0f840ba5caf446c90672faf983f07fc54ca08b90b11da49450e34bb
+  data.tar.gz: b5c592002254c04590580bd1e99a5a10df24ac7c02e3bff008da0535b03147cb5a841916d30337c6ecc7572d018a30f5abb5b4e85394d8538f78b939bddee453

data/.yardopts

@@ -0,0 +1,2 @@
+--readme README.md
+--protected

data/Gemfile

@@ -9,15 +9,19 @@ group :development do
   gem 'activerecord'
   gem 'async'
   gem 'base64'
-  gem 'grpc', '>= 1.65.0.pre2'
-  gem 'grpc-tools'
+  gem 'grpc', '~> 1.69'
+  gem 'grpc-tools', '~> 1.69'
   gem 'minitest'
+  # We are intentionally not pinning OTel versions here so that CI tests the latest. This also means that the OTel
+  # contrib library also does not require specific versions, we are relying on the compatibility rigor of OTel.
+  gem 'opentelemetry-api'
+  gem 'opentelemetry-sdk'
   gem 'rake'
   gem 'rake-compiler'
   gem 'rbs', '~> 3.5.3'
   gem 'rb_sys', '~> 0.9.63'
   gem 'rubocop'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3'
   gem 'steep', '~> 1.7.1'
   gem 'yard'
 end

data/Rakefile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/BlockLength, Lint/MissingCopEnableDirective, Style/DocumentationMethod
+# rubocop:disable Lint/MissingCopEnableDirective, Style/DocumentationMethod
 
 require 'bundler/gem_tasks'
 require 'rb_sys/cargo/metadata'
@@ -55,8 +55,9 @@ module CustomizeYardWarnings # rubocop:disable Style/Documentation
     super
   rescue YARD::Parser::UndocumentableError
     # We ignore if it's an API warning
-    raise unless statement.last.file.start_with?('lib/temporalio/api/') ||
-                 statement.last.file.start_with?('lib/temporalio/internal/bridge/api/')
+    last_file = statement.last.file
+    raise unless (last_file.start_with?('lib/temporalio/api/') && last_file.count('/') > 3) ||
+                 last_file.start_with?('lib/temporalio/internal/bridge/api/')
   end
 end
 
@@ -64,302 +65,15 @@ YARD::Handlers::Ruby::ConstantHandler.prepend(CustomizeYardWarnings)
 
 YARD::Rake::YardocTask.new { |t| t.options = ['--fail-on-warning'] }
 
-require 'fileutils'
-require 'google/protobuf'
+Rake::Task[:yard].enhance([:copy_parent_files]) do
+  rm ['LICENSE', 'README.md']
+end
 
 namespace :proto do
   desc 'Generate API and Core protobufs'
   task :generate do
-    # Remove all existing
-    FileUtils.rm_rf('lib/temporalio/api')
-
-    def generate_protos(api_protos)
-      # Generate API to temp dir and move
-      FileUtils.rm_rf('tmp-proto')
-      FileUtils.mkdir_p('tmp-proto')
-      sh 'bundle exec grpc_tools_ruby_protoc ' \
-         '--proto_path=ext/sdk-core/sdk-core-protos/protos/api_upstream ' \
-         '--proto_path=ext/sdk-core/sdk-core-protos/protos/api_cloud_upstream ' \
-         '--proto_path=ext/additional_protos ' \
-         '--ruby_out=tmp-proto ' \
-         "#{api_protos.join(' ')}"
-
-      # Walk all generated Ruby files and cleanup content and filename
-      Dir.glob('tmp-proto/temporal/api/**/*.rb') do |path|
-        # Fix up the import
-        content = File.read(path)
-        content.gsub!(%r{^require 'temporal/(.*)_pb'$}, "require 'temporalio/\\1'")
-        File.write(path, content)
-
-        # Remove _pb from the filename
-        FileUtils.mv(path, path.sub('_pb', ''))
-      end
-
-      # Move from temp dir and remove temp dir
-      FileUtils.cp_r('tmp-proto/temporal/api', 'lib/temporalio')
-      FileUtils.rm_rf('tmp-proto')
-    end
-
-    # Generate from API with Google ones removed
-    generate_protos(Dir.glob('ext/sdk-core/sdk-core-protos/protos/api_upstream/**/*.proto').reject do |proto|
-      proto.include?('google')
-    end)
-
-    # Generate from Cloud API
-    generate_protos(Dir.glob('ext/sdk-core/sdk-core-protos/protos/api_cloud_upstream/**/*.proto'))
-
-    # Generate additional protos
-    generate_protos(Dir.glob('ext/additional_protos/**/*.proto'))
-
-    # Write files that will help with imports. We are requiring the
-    # request_response and not the service because the service depends on Google
-    # API annotations we don't want to have to depend on.
-    File.write(
-      'lib/temporalio/api/cloud/cloudservice.rb',
-      <<~TEXT
-        # frozen_string_literal: true
-
-        require 'temporalio/api/cloud/cloudservice/v1/request_response'
-      TEXT
-    )
-    File.write(
-      'lib/temporalio/api/workflowservice.rb',
-      <<~TEXT
-        # frozen_string_literal: true
-
-        require 'temporalio/api/workflowservice/v1/request_response'
-      TEXT
-    )
-    File.write(
-      'lib/temporalio/api/operatorservice.rb',
-      <<~TEXT
-        # frozen_string_literal: true
-
-        require 'temporalio/api/operatorservice/v1/request_response'
-      TEXT
-    )
-    File.write(
-      'lib/temporalio/api.rb',
-      <<~TEXT
-        # frozen_string_literal: true
-
-        require 'temporalio/api/cloud/cloudservice'
-        require 'temporalio/api/common/v1/grpc_status'
-        require 'temporalio/api/errordetails/v1/message'
-        require 'temporalio/api/operatorservice'
-        require 'temporalio/api/workflowservice'
-
-        module Temporalio
-          # Raw protocol buffer models.
-          module Api
-          end
-        end
-      TEXT
-    )
-
-    # Write the service classes that have the RPC calls
-    def write_service_file(qualified_service_name:, file_name:, class_name:, service_enum:)
-      # Do service lookup
-      desc = Google::Protobuf::DescriptorPool.generated_pool.lookup(qualified_service_name)
-      raise 'Failed finding service descriptor' unless desc
-
-      # Open file to generate Ruby code
-      File.open("lib/temporalio/client/connection/#{file_name}.rb", 'w') do |file|
-        file.puts <<~TEXT
-          # frozen_string_literal: true
-
-          # Generated code.  DO NOT EDIT!
-
-          require 'temporalio/api'
-          require 'temporalio/client/connection/service'
-          require 'temporalio/internal/bridge/client'
-
-          module Temporalio
-            class Client
-              class Connection
-                # #{class_name} API.
-                class #{class_name} < Service
-                  # @!visibility private
-                  def initialize(connection)
-                    super(connection, Internal::Bridge::Client::#{service_enum})
-                  end
-        TEXT
-
-        desc.each do |method|
-          # Camel case to snake case
-          rpc = method.name.gsub(/([A-Z])/, '_\1').downcase.delete_prefix('_')
-          file.puts <<-TEXT
-
-        # Calls #{class_name}.#{method.name} API call.
-        #
-        # @param request [#{method.input_type.msgclass}] API request.
-        # @param rpc_retry [Boolean] Whether to implicitly retry known retryable errors.
-        # @param rpc_metadata [Hash<String, String>, nil] Headers to include on the RPC call.
-        # @param rpc_timeout [Float, nil] Number of seconds before timeout.
-        # @return [#{method.output_type.msgclass}] API response.
-        def #{rpc}(request, rpc_retry: false, rpc_metadata: nil, rpc_timeout: nil)
-          invoke_rpc(
-            rpc: '#{rpc}',
-            request_class: #{method.input_type.msgclass},
-            response_class: #{method.output_type.msgclass},
-            request:,
-            rpc_retry:,
-            rpc_metadata:,
-            rpc_timeout:
-          )
-        end
-          TEXT
-        end
-
-        file.puts <<~TEXT
-                end
-              end
-            end
-          end
-        TEXT
-      end
-
-      # Open file to generate RBS code
-      # TODO(cretz): Improve this when RBS proto is supported
-      File.open("sig/temporalio/client/connection/#{file_name}.rbs", 'w') do |file|
-        file.puts <<~TEXT
-          # Generated code.  DO NOT EDIT!
-
-          module Temporalio
-            class Client
-              class Connection
-                class #{class_name} < Service
-                  def initialize: (Connection) -> void
-        TEXT
-
-        desc.each do |method|
-          # Camel case to snake case
-          rpc = method.name.gsub(/([A-Z])/, '_\1').downcase.delete_prefix('_')
-          file.puts <<-TEXT
-        def #{rpc}: (untyped request, ?rpc_retry: bool, ?rpc_metadata: Hash[String, String]?, ?rpc_timeout: Float?) -> untyped
-          TEXT
-        end
-
-        file.puts <<~TEXT
-                end
-              end
-            end
-          end
-        TEXT
-      end
-    end
-
-    require './lib/temporalio/api/workflowservice/v1/service'
-    write_service_file(
-      qualified_service_name: 'temporal.api.workflowservice.v1.WorkflowService',
-      file_name: 'workflow_service',
-      class_name: 'WorkflowService',
-      service_enum: 'SERVICE_WORKFLOW'
-    )
-    require './lib/temporalio/api/operatorservice/v1/service'
-    write_service_file(
-      qualified_service_name: 'temporal.api.operatorservice.v1.OperatorService',
-      file_name: 'operator_service',
-      class_name: 'OperatorService',
-      service_enum: 'SERVICE_OPERATOR'
-    )
-    require './lib/temporalio/api/cloud/cloudservice/v1/service'
-    write_service_file(
-      qualified_service_name: 'temporal.api.cloud.cloudservice.v1.CloudService',
-      file_name: 'cloud_service',
-      class_name: 'CloudService',
-      service_enum: 'SERVICE_CLOUD'
-    )
-
-    # Generate Rust code
-    def generate_rust_match_arm(file:, qualified_service_name:, service_enum:, trait:)
-      # Do service lookup
-      desc = Google::Protobuf::DescriptorPool.generated_pool.lookup(qualified_service_name)
-      file.puts <<~TEXT
-        #{service_enum} => match call.rpc.as_str() {
-      TEXT
-
-      desc.to_a.sort_by(&:name).each do |method|
-        # Camel case to snake case
-        rpc = method.name.gsub(/([A-Z])/, '_\1').downcase.delete_prefix('_')
-        file.puts <<~TEXT
-          "#{rpc}" => rpc_call!(self, callback, call, #{trait}, #{rpc}),
-        TEXT
-      end
-      file.puts <<~TEXT
-          _ => Err(error!("Unknown RPC call {}", call.rpc)),
-        },
-      TEXT
-    end
-    File.open('ext/src/client_rpc_generated.rs', 'w') do |file|
-      file.puts <<~TEXT
-        // Generated code.  DO NOT EDIT!
-
-        use magnus::{Error, Ruby};
-        use temporal_client::{CloudService, OperatorService, WorkflowService};
-
-        use super::{error, rpc_call};
-        use crate::{
-            client::{Client, RpcCall, SERVICE_CLOUD, SERVICE_OPERATOR, SERVICE_WORKFLOW},
-            util::AsyncCallback,
-        };
-
-        impl Client {
-            pub fn invoke_rpc(&self, service: u8, callback: AsyncCallback, call: RpcCall) -> Result<(), Error> {
-                match service {
-      TEXT
-      generate_rust_match_arm(
-        file:,
-        qualified_service_name: 'temporal.api.workflowservice.v1.WorkflowService',
-        service_enum: 'SERVICE_WORKFLOW',
-        trait: 'WorkflowService'
-      )
-      generate_rust_match_arm(
-        file:,
-        qualified_service_name: 'temporal.api.operatorservice.v1.OperatorService',
-        service_enum: 'SERVICE_OPERATOR',
-        trait: 'OperatorService'
-      )
-      generate_rust_match_arm(
-        file:,
-        qualified_service_name: 'temporal.api.cloud.cloudservice.v1.CloudService',
-        service_enum: 'SERVICE_CLOUD',
-        trait: 'CloudService'
-      )
-      file.puts <<~TEXT
-                    _ => Err(error!("Unknown service")),
-                }
-            }
-        }
-      TEXT
-    end
-    sh 'cargo', 'fmt', '--', 'ext/src/client_rpc_generated.rs'
-
-    # Generate core protos
-    FileUtils.rm_rf('lib/temporalio/internal/bridge/api')
-    # Generate API to temp dir
-    FileUtils.rm_rf('tmp-proto')
-    FileUtils.mkdir_p('tmp-proto')
-    sh 'bundle exec grpc_tools_ruby_protoc ' \
-       '--proto_path=ext/sdk-core/sdk-core-protos/protos/api_upstream ' \
-       '--proto_path=ext/sdk-core/sdk-core-protos/protos/local ' \
-       '--ruby_out=tmp-proto ' \
-       "#{Dir.glob('ext/sdk-core/sdk-core-protos/protos/local/**/*.proto').join(' ')}"
-    # Walk all generated Ruby files and cleanup content and filename
-    Dir.glob('tmp-proto/temporal/sdk/**/*.rb') do |path|
-      # Fix up the imports
-      content = File.read(path)
-      content.gsub!(%r{^require 'temporal/(.*)_pb'$}, "require 'temporalio/\\1'")
-      content.gsub!(%r{^require 'temporalio/sdk/core/(.*)'$}, "require 'temporalio/internal/bridge/api/\\1'")
-      File.write(path, content)
-
-      # Remove _pb from the filename
-      FileUtils.mv(path, path.sub('_pb', ''))
-    end
-    # Move from temp dir and remove temp dir
-    FileUtils.mkdir_p('lib/temporalio/internal/bridge/api')
-    FileUtils.cp_r(Dir.glob('tmp-proto/temporal/sdk/core/*'), 'lib/temporalio/internal/bridge/api')
-    FileUtils.rm_rf('tmp-proto')
+    require_relative 'extra/proto_gen'
+    ProtoGen.new.run
   end
 end
 
@@ -380,7 +94,7 @@ Rake::Task[:build].enhance([:copy_parent_files]) do
 end
 
 task :rust_lint do
-  sh 'cargo', 'clippy'
+  sh 'cargo', 'clippy', '-p', 'temporalio_bridge', '--no-deps', '--', '-Dwarnings'
   sh 'cargo', 'fmt', '--check'
 end
 

data/lib/temporalio/activity/complete_async_error.rb

@@ -3,7 +3,7 @@
 require 'temporalio/error'
 
 module Temporalio
-  class Activity
+  module Activity
     # Error raised inside an activity to mark that the activity will be completed asynchronously.
     class CompleteAsyncError < Error
     end

data/lib/temporalio/activity/context.rb

@@ -3,7 +3,7 @@
 require 'temporalio/error'
 
 module Temporalio
-  class Activity
+  module Activity
     # Context accessible only within an activity. Use {current} to get the current context. Contexts are fiber or thread
     # local so may not be available in a newly started thread from an activity and may have to be propagated manually.
     class Context
@@ -48,6 +48,12 @@ module Temporalio
         raise NotImplementedError
       end
 
+      # @return [Object, nil] Activity class instance. This should always be present except for advanced cases where the
+      #   definition was manually created without any instance getter/creator.
+      def instance
+        raise NotImplementedError
+      end
+
       # Record a heartbeat on the activity.
       #
       # Heartbeats should be used for all non-immediately-returning, non-local activities and they are required to
@@ -101,7 +107,17 @@ module Temporalio
         }.freeze
       end
 
-      # TODO(cretz): metric meter
+      # @return [Metric::Meter] Metric meter to create metrics on, with some activity-specific attributes already set.
+      # @raise [RuntimeError] Called within a {Testing::ActivityEnvironment} and it was not set.
+      def metric_meter
+        raise NotImplementedError
+      end
+
+      # @return [Client] Temporal client this activity worker is running in.
+      # @raise [RuntimeError] Called within a {Testing::ActivityEnvironment} and it was not set.
+      def client
+        raise NotImplementedError
+      end
     end
   end
 end