diff --git a/Directory.Build.props b/Directory.Build.props index d901a2f0a..d8bd0329d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -30,6 +30,6 @@ $(NoWarn);CS0162;CS1591 - 3.2.0-rc3.443 + 3.2.0-rc3 \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 9fa854ac7..209366965 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -23,9 +23,9 @@ - - - + + + @@ -72,7 +72,7 @@ - + @@ -170,9 +170,9 @@ - - - - + + + + \ No newline at end of file diff --git a/docker/ElsaServer-Datadog.Dockerfile b/docker/ElsaServer-Datadog.Dockerfile index 64e1983ce..3af4d992a 100644 --- a/docker/ElsaServer-Datadog.Dockerfile +++ b/docker/ElsaServer-Datadog.Dockerfile @@ -15,7 +15,7 @@ COPY ./NuGet.Config ./ COPY *.props ./ # restore packages. -RUN dotnet restore "./src/bundles/Elsa.Server.Web/Elsa.Server.Web.csproj" +RUN dotnet restore "./src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj" # build and publish (UseAppHost=false creates platform independent binaries). WORKDIR /source/src/apps/Elsa.Server.Web diff --git a/docker/ElsaStudio.Dockerfile b/docker/ElsaStudio.Dockerfile index 58de21d6f..736c5b497 100644 --- a/docker/ElsaStudio.Dockerfile +++ b/docker/ElsaStudio.Dockerfile @@ -11,7 +11,7 @@ RUN dotnet restore "./src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.cspro RUN dotnet restore "./src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj" # build and publish (UseAppHost=false creates platform independent binaries). -WORKDIR /source/src/bundles/Elsa.Studio.Web +WORKDIR /source/src/apps/Elsa.Studio.Web RUN dotnet build "Elsa.Studio.Web.csproj" -c Release -o /app/build RUN dotnet publish "Elsa.Studio.Web.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net8.0 diff --git a/src/modules/Elsa.ProtoActor/Features/ProtoActorFeature.cs b/src/modules/Elsa.ProtoActor/Features/ProtoActorFeature.cs index 4f08fee4b..e6bf0347d 100644 --- a/src/modules/Elsa.ProtoActor/Features/ProtoActorFeature.cs +++ b/src/modules/Elsa.ProtoActor/Features/ProtoActorFeature.cs @@ -102,14 +102,17 @@ public class ProtoActorFeature : FeatureBase if (_enableMetrics) actorSystemConfig = actorSystemConfig.WithMetrics(); + if (_enableTracing) + actorSystemConfig = actorSystemConfig.WithConfigureProps(props => props.WithTracing()); + ConfigureActorSystemConfig(sp, actorSystemConfig); var clusterProvider = CreateClusterProvider(sp); var system = new ActorSystem(actorSystemConfig).WithServiceProvider(sp); var workflowGrainProps = system.DI().PropsFor(); - if (_enableTracing) - workflowGrainProps = workflowGrainProps.WithTracing(); + // if (_enableTracing) + // workflowGrainProps = workflowGrainProps.WithTracing(); var clusterConfig = ClusterConfig .Setup(_clusterName, clusterProvider, new PartitionIdentityLookup())