Merge branch 'main' into chore/#2266_CleanupPackages

.github/workflows/test-windows-iis-reporter.yml

@@ -21,8 +21,8 @@ jobs:
       - uses: elastic/apm-pipeline-library/.github/actions/test-report@current
         with:
           artifact: test-results-iis       # artifact name
-          name: IIS Tests Summary              # Name of the check run which will be created
-          path: "junit-*.xml"		       # Path to test results (inside artifact .zip)
+          name: IIS Tests Summary          # Name of the check run which will be created
+          path: "junit-*.xml"              # Path to test results (inside artifact .zip)
           reporter: java-junit             # Format of test results
           list-suites: 'failed'
           list-tests: 'failed'

.github/workflows/test-windows-reporter.yml

@@ -16,8 +16,8 @@ jobs:
       - uses: elastic/apm-pipeline-library/.github/actions/test-report@current
         with:
           artifact: test-results-windows   # artifact name
-          name: Windows Tests Summary              # Name of the check run which will be created
-          path: "junit-*.xml"		       # Path to test results (inside artifact .zip)
+          name: Windows Tests Summary      # Name of the check run which will be created
+          path: "junit-*.xml"              # Path to test results (inside artifact .zip)
           reporter: java-junit             # Format of test results
           list-suites: 'failed'
           list-tests: 'failed'

.github/workflows/test-windows.yml

@@ -41,6 +41,7 @@ jobs:
         run: dotnet build -c Release --verbosity minimal
 
       - name: Setup Testcontainers Cloud Client
+        if: github.event_name != 'pull_request' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
         uses: atomicjar/testcontainers-cloud-setup-action@v1
         with:
           token: ${{ secrets.TC_CLOUD_TOKEN }}
@@ -84,6 +85,7 @@ jobs:
         run: ./build.bat profiler-zip
 
       - name: Setup Testcontainers Cloud Client
+        if: github.event_name != 'pull_request' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
         uses: atomicjar/testcontainers-cloud-setup-action@v1
         with:
           token: ${{ secrets.TC_CLOUD_TOKEN }}

src/Elastic.Apm/Api/ProcessInformation.cs

@@ -0,0 +1,30 @@
+// Licensed to Elasticsearch B.V under
+// one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System.Diagnostics;
+using Elastic.Apm.Api.Constraints;
+using Elastic.Apm.Helpers;
+
+namespace Elastic.Apm.Api;
+
+internal class ProcessInformation
+{
+	public int Pid { get; set; }
+
+	[MaxLength]
+	public string Title { get; set; }
+
+	public static ProcessInformation Create()
+	{
+		var p = Process.GetCurrentProcess();
+		return new ProcessInformation { Pid = p.Id, Title = p.ProcessName };
+	}
+
+	public override string ToString() => new ToStringBuilder(nameof(Service))
+	{
+		{ nameof(Pid), Pid },
+		{ nameof(Title), Title }
+	}.ToString();
+}

src/Elastic.Apm/Model/Metadata.cs

@@ -18,6 +18,8 @@ internal class Metadata
 		// ReSharper disable once UnusedAutoPropertyAccessor.Global - used by Json.Net
 		public Service Service { get; set; }
 
+		public ProcessInformation Process { get; set; }
+
 		// ReSharper disable once UnusedAutoPropertyAccessor.Global
 		public Api.System System { get; set; }
 

src/Elastic.Apm/Report/PayloadSenderV2.cs

@@ -88,7 +88,8 @@ public PayloadSenderV2(
 			_cloudMetadataProviderCollection = new CloudMetadataProviderCollection(configuration.CloudProvider, _logger, environmentVariables);
 			_apmServerInfo = apmServerInfo ?? new ApmServerInfo();
 			_serverInfoCallback = serverInfoCallback;
-			_metadata = new Metadata { Service = service, System = System };
+			var process = ProcessInformation.Create();
+			_metadata = new Metadata { Service = service, System = System, Process = process };
 			foreach (var globalLabelKeyValue in configuration.GlobalLabels)
 				_metadata.Labels.Add(globalLabelKeyValue.Key, globalLabelKeyValue.Value);
 			_cachedActivationMethod = _metadata.Service?.Agent.ActivationMethod;

test/Elastic.Apm.Tests.MockApmServer/MetadataDto.cs

@@ -6,6 +6,7 @@
 using Elastic.Apm.Api;
 using Elastic.Apm.Config;
 using Elastic.Apm.Helpers;
+using Elastic.Apm.Model;
 
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable UnusedAutoPropertyAccessor.Global
@@ -17,6 +18,7 @@ namespace Elastic.Apm.Tests.MockApmServer
 	internal class MetadataDto : IDto
 	{
 		public Service Service { get; set; }
+		public ProcessInformation Process { get; set; }
 		public Api.System System { get; set; }
 		public Api.Cloud Cloud { get; set; }
 		public Dictionary<string, string> Labels { get; set; }
@@ -25,6 +27,7 @@ public override string ToString() =>
 			new ToStringBuilder(nameof(MetadataDto))
 			{
 				{ nameof(Service), Service },
+				{ nameof(Process), Process },
 				{ nameof(System), System },
 				{ nameof(Labels), AbstractConfigurationReader.ToLogString(Labels) },
 				{ nameof(Cloud), Cloud },

test/Elastic.Apm.Tests.Utilities/TestEnvironment.cs

@@ -36,9 +36,7 @@ public static class TestEnvironment
 
 		static TestEnvironment()
 		{
-			// TODO this IsCi check is no longer valid, once we are green on Github Action
-			// we should be able to remove all special handling related to this
-			IsCi = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("BUILD_ID"));
+			IsCi = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CI"));
 			IsGitHubActions = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTION"));
 			IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 			IsLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);

test/Elastic.Apm.Tests.Utilities/XUnit/DisabledOnWindowsFact.cs

@@ -3,7 +3,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using Elastic.Apm.Tests.Utilities.Docker;
 using Xunit;
 
 namespace Elastic.Apm.Tests.Utilities.XUnit;

test/Elastic.Apm.Tests.Utilities/XUnit/DockerAttributes.cs

@@ -0,0 +1,79 @@
+// Licensed to Elasticsearch B.V under
+// one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System;
+using System.IO;
+using ProcNet;
+using Xunit;
+
+namespace Elastic.Apm.Tests.Utilities.XUnit;
+
+
+/// <inheritdoc cref="DockerTheory"/>
+public sealed class DockerFact : FactAttribute
+{
+	public DockerFact() => Skip = DockerTheory.ShouldSkip();
+}
+
+/// <summary>
+/// <para>Locally we always run TestContainers through docker.</para>
+/// <para>On Github Actions windows hosts we use TC cloud to launch linux docker containers</para>
+/// <para>
+/// When forks run the tests on pull request TestContainers Cloud won't be configured and available.
+/// So we opt to skip instead.
+/// </para>
+/// </summary>
+public sealed class DockerTheory : TheoryAttribute
+{
+	public DockerTheory() => Skip = ShouldSkip();
+
+	public static string ShouldSkip()
+	{
+		var tcCloudConfigured = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TC_CLOUD_TOKEN"));
+		if (TestEnvironment.IsGitHubActions
+			&& TestEnvironment.IsWindows
+			&& !tcCloudConfigured)
+			return "Running on Github Action Windows host with no active TC_CLOUD_TOKEN configuration, skipping.";
+		// if running locally skip the test because it needs docker installed.
+		else if (!DockerUtils.HasDockerInstalled)
+			return "This test requires docker to be installed";
+
+		return null;
+	}
+}
+
+/// <summary>
+/// Marks a test that has to be running inside of a docker container
+/// </summary>
+public class RunningInDockerFactAttribute : FactAttribute
+{
+	public RunningInDockerFactAttribute()
+	{
+		if (!DockerUtils.IsRunningInDocker())
+			Skip = "Not running in a docker container";
+	}
+}
+
+internal static class DockerUtils
+{
+	public static bool IsRunningInDocker() =>
+		File.Exists("/proc/1/cgroup") && File.ReadAllText("/proc/1/cgroup").Contains("docker");
+
+	public static bool HasDockerInstalled { get; }
+
+	static DockerUtils()
+	{
+		try
+		{
+			var result = Proc.Start(new StartArguments("docker", "--version"));
+			HasDockerInstalled = result.ExitCode == 0;
+		}
+		catch (Exception)
+		{
+			HasDockerInstalled = false;
+		}
+	}
+
+}

test/instrumentations/Elastic.Apm.Docker.Tests/BasicDockerTests.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Apm.Report;
-using Elastic.Apm.Tests.Utilities.Docker;
+using Elastic.Apm.Tests.Utilities.XUnit;
 using FluentAssertions;
 
 namespace Elastic.Apm.Docker.Tests

test/instrumentations/Elastic.Apm.Elasticsearch.Tests/ElasticsearchTests.cs

@@ -9,7 +9,6 @@
 using Elastic.Apm.Api;
 using Elastic.Apm.DiagnosticSource;
 using Elastic.Apm.Tests.Utilities;
-using Elastic.Apm.Tests.Utilities.Docker;
 using Elastic.Apm.Tests.Utilities.XUnit;
 using Elasticsearch.Net;
 using FluentAssertions;

test/instrumentations/Elastic.Apm.MongoDb.Tests/MongoApmTests.cs

@@ -10,7 +10,6 @@
 using Elastic.Apm.Api;
 using Elastic.Apm.MongoDb.Tests.Fixture;
 using Elastic.Apm.Tests.Utilities;
-using Elastic.Apm.Tests.Utilities.Docker;
 using Elastic.Apm.Tests.Utilities.XUnit;
 using FluentAssertions;
 using MongoDB.Bson;

test/instrumentations/Elastic.Apm.SqlClient.Tests/EfCoreWithMsSqlTests.cs

@@ -8,7 +8,6 @@
 using Elastic.Apm.EntityFrameworkCore;
 using Elastic.Apm.Instrumentations.SqlClient;
 using Elastic.Apm.Tests.Utilities;
-using Elastic.Apm.Tests.Utilities.Docker;
 using Elastic.Apm.Tests.Utilities.XUnit;
 using FluentAssertions;
 using Microsoft.EntityFrameworkCore;

test/instrumentations/Elastic.Apm.SqlClient.Tests/SqlClientListenerTests.cs

@@ -11,7 +11,6 @@
 using Elastic.Apm.Api;
 using Elastic.Apm.Instrumentations.SqlClient;
 using Elastic.Apm.Tests.Utilities;
-using Elastic.Apm.Tests.Utilities.Docker;
 using Elastic.Apm.Tests.Utilities.XUnit;
 using FluentAssertions;
 using Xunit;

test/instrumentations/Elastic.Apm.StackExchange.Redis.Tests/ProfilingSessionTests.cs

@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Elastic.Apm.Api;
 using Elastic.Apm.Tests.Utilities;
-using Elastic.Apm.Tests.Utilities.Docker;
+using Elastic.Apm.Tests.Utilities.XUnit;
 using FluentAssertions;
 using StackExchange.Redis;
 using Testcontainers.Redis;

test/instrumentations/Elastic.Clients.Elasticsearch.Tests/ElasticsearchTests.cs

@@ -11,7 +11,7 @@
 using Elastic.Apm.DiagnosticSource;
 using Elastic.Apm.Elasticsearch;
 using Elastic.Apm.Tests.Utilities;
-using Elastic.Apm.Tests.Utilities.Docker;
+using Elastic.Apm.Tests.Utilities.XUnit;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;

test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/MySqlCommandTests.cs

@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Elastic.Apm.Tests.MockApmServer;
 using Elastic.Apm.Tests.Utilities;
-using Elastic.Apm.Tests.Utilities.Docker;
+using Elastic.Apm.Tests.Utilities.XUnit;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;

test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/NpgSqlCommandTests.cs

@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Elastic.Apm.Tests.MockApmServer;
 using Elastic.Apm.Tests.Utilities;
-using Elastic.Apm.Tests.Utilities.Docker;
+using Elastic.Apm.Tests.Utilities.XUnit;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;

test/profiler/Elastic.Apm.Profiler.Managed.Tests/AdoNet/OracleManagedDataAccessCommandTests.cs

@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Elastic.Apm.Tests.MockApmServer;
 using Elastic.Apm.Tests.Utilities;
-using Elastic.Apm.Tests.Utilities.Docker;
+using Elastic.Apm.Tests.Utilities.XUnit;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;