Merge branch 'main' into chore/#2305_RemovePolyfill

elastic · May 23, 2024 · aada10e · aada10e
2 parents e59b174 + 60f34fb
commit aada10e
Show file tree

Hide file tree

Showing 16 changed files with 150 additions and 368 deletions.
diff --git a/.ci/snapshoty.yml b/.ci/snapshoty.yml
@@ -44,6 +44,10 @@ artifacts:
     output_pattern: '{project}/{github_branch_name}/elastic-apm-dotnet-agent-{app_version}-{revision}-{github_sha_short}.zip'
     metadata: *metadata
   - path: './build/output/_packages'
-    files_pattern: 'Elastic\.Apm(?P<component>[\w\.]*)\.(?P<app_version>\d+\.\d+\.\d+)-(?P<revision>[\w\.]+)(-(?P<revision_dup>\w+)-(?P<date>[\d-]+))?\.nupkg'
+    files_pattern: 'Elastic\.Apm\.(?P<component>[\w\.]*)\.(?P<app_version>\d+\.\d+\.\d+)-(?P<revision>[\w\.]+)(-(?P<revision_dup>\w+)-(?P<date>[\d-]+))?\.nupkg'
     output_pattern: '{project}/{github_branch_name}/elastic-apm-dotnet-{component}-{app_version}-{revision}-{github_sha_short}.nupkg'
     metadata: *metadata
+  - path: './build/output/_packages'
+    files_pattern: 'Elastic\.Apm\.(?P<app_version>\d+\.\d+\.\d+)-(?P<revision>[\w\.]+)(-(?P<revision_dup>\w+)-(?P<date>[\d-]+))?\.nupkg'
+    output_pattern: '{project}/{github_branch_name}/elastic-apm-dotnet-{app_version}-{revision}-{github_sha_short}.nupkg'
+    metadata: *metadata
diff --git a/.github/workflows/opentelemetry.yml b/.github/workflows/opentelemetry.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,6 +56,7 @@ jobs:
       run: |
         docker build . -t docker.elastic.co/observability/apm-agent-dotnet:${{ steps.bootstrap.outputs.agent-version }} \
             --build-arg AGENT_ZIP_FILE=build/output/elastic_apm_profiler_${{ steps.bootstrap.outputs.agent-version }}-linux-x64.zip
+        
     - name: Push Profiler Docker Image
       continue-on-error: true #continue for now until we see it working in action
       run: |

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -69,9 +69,10 @@ jobs:
 
   azure-tests:
     runs-on: ubuntu-latest
-    if: |
-      github.event_name != 'pull_request'
-      || github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
+    if: ${{ false }}
+    #if: |
+    #  github.event_name != 'pull_request'
+    #  || github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
     steps:
       - uses: actions/checkout@v4
       - name: Bootstrap Action Workspace

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -74,7 +74,7 @@ jobs:
   profiler-tests:
     runs-on: windows-2022
     # Disable profiler tests for now
-    # if: ${{ false }} 
+    if: ${{ false }} 
     steps:
       - uses: actions/checkout@v4
       - name: Bootstrap Action Workspace

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -23,6 +23,13 @@ endif::[]
 [[release-notes-1.x]]
 === .NET Agent version 1.x
 
+[[release-notes-1.27.1]]
+==== 1.27.1 - 2024/05/16
+
+===== Bug fixes
+
+* Remove invalid profiler method integrations by @stevejgordon in https://github.com/elastic/apm-agent-dotnet/pull/2349
+
 [[release-notes-1.27.0]]
 ==== 1.27.0 - 2024/04/30
 

diff --git a/build/build.fsproj b/build/build.fsproj
@@ -28,12 +28,12 @@
     <PackageReference Include="Bullseye" Version="3.5.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20427.1" />
 
-    <PackageReference Include="Fake.Core.Environment" Version="5.20.4" />
-    <PackageReference Include="Fake.Core.SemVer" Version="5.20.4" />
-    <PackageReference Include="Fake.DotNet.MsBuild" Version="5.20.4" />
-    <PackageReference Include="Fake.IO.FileSystem" Version="5.20.4" />
-    <PackageReference Include="Fake.IO.Zip" Version="5.20.4" />
-    <PackageReference Include="Fake.Tools.Git" Version="5.20.4" />
+    <PackageReference Include="Fake.Core.Environment" Version="6.0.0" />
+    <PackageReference Include="Fake.Core.SemVer" Version="6.0.0" />
+    <PackageReference Include="Fake.DotNet.MsBuild" Version="6.0.0" />
+    <PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
+    <PackageReference Include="Fake.IO.Zip" Version="6.0.0" />
+    <PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
 
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
diff --git a/build/scripts/Build.fs b/build/scripts/Build.fs
@@ -70,13 +70,14 @@ module Build =
         DotNet.Exec [target; projectOrSln; "-c"; "Release"; "-v"; "q"; "--nologo"]
 
     let private msBuild target projectOrSln =
-        MSBuild.build (fun p ->
+        MSBuild.build (fun (p: MSBuildParams) ->
                 { p with
                     Verbosity = Some(Quiet)
                     Targets = [target]
                     Properties = [
                         "Configuration", "Release"
                         "Optimize", "True"
+                        "dummy", "test" // See https://github.com/fsprojects/FAKE/issues/2738
                     ]
                     // current version of Fake MSBuild module does not support latest bin log file
                     // version of MSBuild in VS 16.8, so disable for now.
@@ -248,13 +249,6 @@ module Build =
         ZipFile.CreateFromDirectory(agentDir.FullName, Paths.BuildOutput versionedName + ".zip")
 
 
-    /// Builds docker image including the ElasticApmAgent  
-    let AgentDocker() =
-        let agentVersion = Versioning.CurrentVersion.FileVersion.ToString()        
-
-        Docker.Exec [ "build"; "--file"; "./build/docker/Dockerfile";
-                      "--tag"; sprintf "observability/apm-agent-dotnet:%s" agentVersion; "./build/output/ElasticApmAgent" ]
-
     let ProfilerIntegrations () =
         DotNet.Exec ["run"; "--project"; Paths.ProfilerProjFile "Elastic.Apm.Profiler.IntegrationsGenerator"; "--"
                      "-i"; Paths.SrcProfiler "Elastic.Apm.Profiler.Managed/bin/Release/netstandard2.0/Elastic.Apm.Profiler.Managed.dll"

diff --git a/build/scripts/Targets.fs b/build/scripts/Targets.fs
@@ -122,10 +122,6 @@ module Main =
                 Build.AgentZip()
             )
 
-            Targets.Target("agent-docker", ["agent-zip"], fun _ ->
-                Build.AgentDocker()
-            )   
-
             Targets.Target("release-notes", fun _ ->
                 let version = cmdLine.ValueForOption<string>("version")
                 let currentVersion = Versioning.CurrentVersion.AssemblyVersion

diff --git a/docs/integrations.asciidoc b/docs/integrations.asciidoc
@@ -24,8 +24,8 @@
 |MySql.Data 6.7.0 - 8.{star}.{star}
 
 .1+.^|NpgsqlCommand
-|{nuget}/Npgsql[Npgsql 4.0.0 - 6.{star}.{star}]
-|Npgsql 4.0.0 - 6.{star}.{star}
+|{nuget}/Npgsql[Npgsql 4.0.0 - 7.{star}.{star}]
+|Npgsql 4.0.0 - 7.{star}.{star}
 
 .2+.^|OracleCommand
 |{nuget}/Oracle.ManagedDataAccess[Oracle.ManagedDataAccess 12.2.1100 - 21.{star}.{star}]

diff --git a/...Apm.Profiler.Managed/Integrations/AdoNet/CommandExecuteNonQueryWithBehaviorIntegration.cs b/...Apm.Profiler.Managed/Integrations/AdoNet/CommandExecuteNonQueryWithBehaviorIntegration.cs
@@ -20,14 +20,7 @@ namespace Elastic.Apm.Profiler.Managed.Integrations.AdoNet
 	/// CallTarget instrumentation for:
 	/// int [Command].ExecuteNonQuery(CommandBehavior)
 	/// </summary>
-	[InstrumentMySqlAttribute(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentOracleManagedDataAccess(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentOracleManagedDataAccessCore(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentMicrosoftDataSqlite(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
 	[InstrumentSystemDataSqlite(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentSystemDataSql(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentSystemDataSqlClient(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentMicrosoftDataSqlClient(Method = ExecuteNonQuery, ReturnType = ClrTypeNames.Int32, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
 	public class CommandExecuteNonQueryWithBehaviorIntegration
 	{
 		/// <summary>

diff --git a/...c.Apm.Profiler.Managed/Integrations/AdoNet/CommandExecuteScalarWithBehaviorIntegration.cs b/...c.Apm.Profiler.Managed/Integrations/AdoNet/CommandExecuteScalarWithBehaviorIntegration.cs
@@ -20,19 +20,7 @@ namespace Elastic.Apm.Profiler.Managed.Integrations.AdoNet
 	/// CallTarget instrumentation for:
 	/// object [Command].ExecuteScalar(CommandBehavior)
 	/// </summary>
-	[InstrumentMySqlAttribute(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentOracleManagedDataAccess(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentOracleManagedDataAccessCore(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentMicrosoftDataSqlite(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
 	[InstrumentSystemDataSqlite(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentSystemDataSql(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object, ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentSystemDataSqlClient(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
-	[InstrumentMicrosoftDataSqlClient(Method = ExecuteScalar, ReturnType = ClrTypeNames.Object,
-		ParameterTypes = new[] { AdoNetTypeNames.CommandBehavior })]
 	public class CommandExecuteScalarWithBehaviorIntegration
 	{
 		/// <summary>