Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Temporalio" Version="1.9.0" />
<PackageReference Include="Temporalio.Extensions.DiagnosticSource" Version="1.9.0" />
<PackageReference Include="Temporalio.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="Temporalio.Extensions.OpenTelemetry" Version="1.9.0" />
<PackageReference Include="Temporalio" Version="1.10.0" />
<PackageReference Include="Temporalio.Extensions.DiagnosticSource" Version="1.10.0" />
<PackageReference Include="Temporalio.Extensions.Hosting" Version="1.10.0" />
<PackageReference Include="Temporalio.Extensions.OpenTelemetry" Version="1.10.0" />
<!--
Can also reference the SDK downloaded to a local directory:
<ProjectReference Include="$(MSBuildThisFileDirectory)..\temporal-sdk-dotnet\src\Temporalio\Temporalio.csproj" />
Expand Down
7 changes: 2 additions & 5 deletions src/ActivityHeartbeatingCancellation/Program.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Exceptions;
using Temporalio.Worker;
using TemporalioSamples.ActivityHeartbeatingCancellation;

// Create a client to localhost on default namespace
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
Expand Down
7 changes: 2 additions & 5 deletions src/ActivitySimple/Program.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Worker;
using TemporalioSamples.ActivitySimple;

// Create a client to localhost on default namespace
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
Expand Down
7 changes: 2 additions & 5 deletions src/ActivityWorker/Program.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
using Temporalio.Activities;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Worker;
using Temporalio.Workflows;
using TemporalioSamples.ActivityWorker;

// Create a client to localhost on default namespace
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
var client = await TemporalClient.ConnectAsync(connectOptions);

// Create worker
Expand Down
7 changes: 2 additions & 5 deletions src/AspNet/Web/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using TemporalioSamples.AspNet.Worker;

var builder = WebApplication.CreateBuilder(args);
Expand All @@ -15,10 +15,7 @@
// on separately (VSTHRD003). We may prefer a direct DI extension, see
// https://github.com/temporalio/sdk-dotnet/issues/46.
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = ctx.GetRequiredService<ILoggerFactory>();
return TemporalClient.ConnectAsync(connectOptions);
});
Expand Down
7 changes: 2 additions & 5 deletions src/Bedrock/Basic/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Extensions.Hosting;
using TemporalioSamples.Bedrock.Basic;

Expand Down Expand Up @@ -51,10 +51,7 @@ async Task SendMessageAsync()
async Task<ITemporalClient> CreateClientAsync()
{
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
Expand Down
7 changes: 2 additions & 5 deletions src/Bedrock/Entity/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Extensions.Hosting;
using TemporalioSamples.Bedrock.Entity;

Expand Down Expand Up @@ -82,10 +82,7 @@ async Task EndChatAsync()
async Task<ITemporalClient> CreateClientAsync()
{
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
Expand Down
7 changes: 2 additions & 5 deletions src/Bedrock/SignalsAndQueries/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Extensions.Hosting;
using TemporalioSamples.Bedrock.SignalsAndQueries;

Expand Down Expand Up @@ -73,10 +73,7 @@ async Task GetHistoryAsync()
async Task<ITemporalClient> CreateClientAsync()
{
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
Expand Down
7 changes: 2 additions & 5 deletions src/ContextPropagation/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Converters;
using Temporalio.Worker;
using TemporalioSamples.ContextPropagation;
Expand All @@ -13,10 +13,7 @@

// Create a client to localhost on default namespace
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = loggerFactory;
// This is where we set the interceptor to propagate context
connectOptions.Interceptors = new[]
Expand Down
7 changes: 2 additions & 5 deletions src/CounterInterceptor/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace TemporalioSamples.CounterInterceptor;

using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Worker;

internal class Program
Expand All @@ -10,10 +10,7 @@ private static async Task Main(string[] args)
{
var counterInterceptor = new MyCounterInterceptor();
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.Interceptors = new[]
{
counterInterceptor,
Expand Down
7 changes: 2 additions & 5 deletions src/DependencyInjection/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Extensions.Hosting;
using TemporalioSamples.DependencyInjection;

Expand Down Expand Up @@ -27,10 +27,7 @@ async Task RunWorkerAsync()
async Task ExecuteWorkflowAsync()
{
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
Expand Down
7 changes: 2 additions & 5 deletions src/Dsl/Program.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Worker;
using TemporalioSamples.Dsl;

// Create a client to localhost on default namespace
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";

connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
Expand Down
7 changes: 2 additions & 5 deletions src/EagerWorkflowStart/Program.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Worker;
using TemporalioSamples.EagerWorkflowStart;

// Create a client to localhost on default namespace
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
Expand Down
7 changes: 2 additions & 5 deletions src/Encryption/Starter/Program.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Converters;
using TemporalioSamples.Encryption.Codec;
using TemporalioSamples.Encryption.Worker;

// Create a client to localhost on default namespace
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.DataConverter = DataConverter.Default with { PayloadCodec = new EncryptionCodec() };
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
Expand Down
2 changes: 1 addition & 1 deletion src/EnvConfig/LoadFromFile.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;

namespace TemporalioSamples.EnvConfig;

Expand Down
2 changes: 1 addition & 1 deletion src/EnvConfig/LoadProfile.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;

namespace TemporalioSamples.EnvConfig;

Expand Down
7 changes: 2 additions & 5 deletions src/Mutex/Program.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
using System.Diagnostics;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Worker;
using TemporalioSamples.Mutex;
using TemporalioSamples.Mutex.Impl;

var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").SetMinimumLevel(LogLevel.Information));
var client = await TemporalClient.ConnectAsync(connectOptions);
Expand Down
7 changes: 2 additions & 5 deletions src/NexusContextPropagation/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Client.Interceptors;
using Temporalio.Common.EnvConfig;
using Temporalio.Converters;
using Temporalio.Worker;
using TemporalioSamples.ContextPropagation;
Expand All @@ -26,10 +26,7 @@
Task<TemporalClient> ConnectClientAsync(string temporalNamespace)
{
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.Namespace = temporalNamespace;
connectOptions.LoggerFactory = loggerFactory;
connectOptions.Interceptors = new IClientInterceptor[]
Expand Down
7 changes: 2 additions & 5 deletions src/NexusMultiArg/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Worker;
using TemporalioSamples.NexusMultiArg;
using TemporalioSamples.NexusMultiArg.Caller;
Expand All @@ -23,10 +23,7 @@
Task<TemporalClient> ConnectClientAsync(string temporalNamespace)
{
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.Namespace = temporalNamespace;
connectOptions.LoggerFactory = loggerFactory;
return TemporalClient.ConnectAsync(connectOptions);
Expand Down
7 changes: 2 additions & 5 deletions src/NexusSimple/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Worker;
using TemporalioSamples.NexusSimple;
using TemporalioSamples.NexusSimple.Caller;
Expand All @@ -23,10 +23,7 @@
Task<TemporalClient> ConnectClientAsync(string temporalNamespace)
{
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.Namespace = temporalNamespace;
connectOptions.LoggerFactory = loggerFactory;
return TemporalClient.ConnectAsync(connectOptions);
Expand Down
7 changes: 2 additions & 5 deletions src/OpenTelemetry/CoreSdkForwarding/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Extensions.OpenTelemetry;
using Temporalio.Runtime;
using Temporalio.Worker;
Expand All @@ -27,10 +27,7 @@

// Create a client to localhost on default namespace
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
Expand Down
7 changes: 2 additions & 5 deletions src/Patching/Program.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
using Microsoft.Extensions.Logging;
using Temporalio.Client;
using Temporalio.Client.EnvConfig;
using Temporalio.Common.EnvConfig;
using Temporalio.Worker;
using TemporalioSamples.Patching;

// Create a client to localhost on default namespace
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
if (string.IsNullOrEmpty(connectOptions.TargetHost))
{
connectOptions.TargetHost = "localhost:7233";
}
connectOptions.TargetHost ??= "localhost:7233";
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
builder.
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").
Expand Down
Loading
Loading