Prepare for 1.12.0 release (#1560)

elastic · Nov 11, 2021 · 9a6d3b0 · 9a6d3b0
1 parent 99377bb
commit 9a6d3b0
Show file tree

Hide file tree

Showing 10 changed files with 240 additions and 190 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -23,6 +23,40 @@ endif::[]
 [[release-notes-1.x]]
 === .NET Agent version 1.x
 
+[[release-notes-1.12.0]]
+==== 1.12.0
+
+[float]
+===== Breaking changes
+
+- {pull}1520[#1520] Auto-infer destination.service.resource and adapt public API (issues: {issue}1330[#1330])
++
+`boolean` `isExitSpan` parameter introduced to Start* and Capture* public APIs to denote when a span
+is an exit span.
+
+[float]
+===== Features
+
+- {pull}1511[#1511] Implement Dropped span statistics
+- {pull}1515[#1515] Ignore duplicate Diagnostic listener subscriptions (issue: {issue}1119[#1119])
+- {pull}1518[#1518] Implement User-Agent spec for .NET agent (issue: #1517)
+- {pull}1525[#1525] Add message related properties to transactions and spans (issue: {issue}1512[#1512])
+- {pull}1534[#1534] Add profiler auto instrumentation (issue: {issue}1522[#1522])
+- {pull}1548[#1548] Add profiler auto instrumentation for RabbitMQ (issue: {issue}1223[#1223])
+- {pull}1528[#1528] Platform detection: Handle .NET 6 (issue: {issue}1513[#1513])
+- {pull}1492[#1492] Remove use of Socket.Encrypted to determine secure
+- {pull}1520[#1520] Auto-infer destination.service.resource and adapt public API (issues: {issue}1330[#1330])
+- {pull}1540[#1540] Stop recording transaction metrics (issue: {issue}1523[#1523])
+
+[float]
+===== Bug fixes
+
+- {pull}1484[#1484] Capture spans for new Azure Storage SDKs (issue: {issue}1352[#1352])
+- {pull}1509[#1509] Use Environment.MachineName to get HostName (issue: {issue}1504[#1504])
+- {pull}1510[#1510] Check context is not null when sanitizing error request headers (issue: {issue}1503[#1503])
+- {pull}1536[#1536] Improve Performance counter handling for metrics on Windows (issue: {issue}1505[#1505])
+- {pull}1538[#1538] Collect .NET Framework GC metrics only when filtering supported (issue: {issue}1346[#1346])
+- {pull}1557[#1557] Handle enabled/recording=false configuration when capturing errors
 
 [[release-notes-1.11.1]]
 ==== 1.11.1

diff --git a/build/scripts/Build.fs b/build/scripts/Build.fs
@@ -256,15 +256,16 @@ module Build =
 
     /// Creates versioned elastic_apm_profiler.zip file containing all components needed for profiler auto-instrumentation  
     let ProfilerZip (canary:bool) =
-        let name = "elastic_apm_profiler"      
+        let name = "elastic_apm_profiler"
+        let currentAssemblyVersion = Versioning.CurrentVersion.AssemblyVersion
         let versionedName =
             let os =
                 if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then "win-x64"
                 else "linux-x64"      
             if canary then
-                sprintf "%s_%s-%s-%s" name (Versioning.CurrentVersion.AssemblyVersion.ToString()) os versionSuffix
+                sprintf "%s_%s-%s-%s" name (currentAssemblyVersion.ToString()) os versionSuffix
             else
-                sprintf "%s_%s-%s" name (Versioning.CurrentVersion.AssemblyVersion.ToString()) os
+                sprintf "%s_%s-%s" name (currentAssemblyVersion.ToString()) os
 
         let profilerDir = Paths.BuildOutput name |> DirectoryInfo                    
         profilerDir.Create()
@@ -274,11 +275,17 @@ module Build =
             "target/release/elastic_apm_profiler.dll"
             "target/release/libelastic_apm_profiler.so"
             Paths.Src "elastic_apm_profiler/NOTICE"
+            Paths.Src "elastic_apm_profiler/README"
             "LICENSE"
         }
         |> Seq.map FileInfo
         |> Seq.filter (fun file -> file.Exists)
-        |> Seq.iter (fun file -> file.CopyTo(Path.combine profilerDir.FullName file.Name, true) |> ignore)
+        |> Seq.iter (fun file ->
+            let destination = Path.combine profilerDir.FullName file.Name
+            let newFile = file.CopyTo(destination, true)      
+            if newFile.Name = "README" then
+                File.applyReplace (fun s -> s.Replace("${VERSION}", sprintf "%i.%i" currentAssemblyVersion.Major currentAssemblyVersion.Minor)) newFile.FullName
+        )
 
         Directory.GetDirectories((Paths.BuildOutput "Elastic.Apm.Profiler.Managed"), "*", SearchOption.TopDirectoryOnly)
         |> Seq.map DirectoryInfo

diff --git a/docs/integrations.asciidoc b/docs/integrations.asciidoc
@@ -1,57 +1,57 @@
-:star: *
-:nuget: https://www.nuget.org/packages
-
-|===
-|Integration name |NuGet package version(s) |Assembly version(s) 
-.2+.^|AdoNet
-|part of .NET
-|System.Data 4.0.0 - 4.{star}.{star}
-
-|part of .NET
-|System.Data.Common 4.0.0 - 5.{star}.{star}
-
-.1+.^|AspNet
-|part of .NET Framework
-|System.Web 4.0.0 - 4.{star}.{star}
-
-.1+.^|Kafka
-|{nuget}/Confluent.Kafka[Confluent.Kafka 1.4.0 - 1.{star}.{star}]
-|Confluent.Kafka 1.4.0 - 1.{star}.{star}
-
-.1+.^|MySqlCommand
-|{nuget}/MySql.Data[MySql.Data 6.7.0 - 8.{star}.{star}]
-|MySql.Data 6.7.0 - 8.{star}.{star}
-
-.1+.^|NpgsqlCommand
-|{nuget}/Npgsql[Npgsql 4.0.0 - 5.{star}.{star}]
-|Npgsql 4.0.0 - 5.{star}.{star}
-
-.2+.^|OracleCommand
-|{nuget}/Oracle.ManagedDataAccess[Oracle.ManagedDataAccess 12.2.1100 - 21.*.*]
-|Oracle.ManagedDataAccess 4.122.0 - 4.122.{star}
-
-|{nuget}/Oracle.ManagedDataAccess.Core[Oracle.ManagedDataAccess.Core 2.0.0 - 2.{star}.{star}]
-|Oracle.ManagedDataAccess 2.0.0 - 2.{star}.{star}
-
-.1+|RabbitMQ
-|{nuget}/RabbitMQ.Client[RabbitMQ.Client 3.6.9 - 6.{star}.{star}]
-|RabbitMQ.Client 3.6.9 - 6.{star}.{star}
-
-.3+.^|SqlCommand
-|part of .NET
-|System.Data 4.0.0 - 4.{star}.{star}
-
-|{nuget}/System.Data.SqlClient[System.Data.SqlClient 4.0.0 - 4.{star}.{star}]
-|System.Data.SqlClient 4.0.0 - 4.{star}.{star}
-
-|{nuget}/Microsoft.Data.SqlClient[Microsoft.Data.SqlClient 1.0.0 - 2.{star}.{star}]
-|Microsoft.Data.SqlClient 1.0.0 - 2.{star}.{star}
-
-.2+.^|SqliteCommand
-|{nuget}/Microsoft.Data.Sqlite[Microsoft.Data.Sqlite 2.0.0 - 5.{star}.{star}]
-|Microsoft.Data.Sqlite 2.0.0 - 5.{star}.{star}
-
-|{nuget}/System.Data.SQLite[System.Data.SQLite 1.0.0 - 2.{star}.{star}]
-|System.Data.SQLite 1.0.0 - 2.{star}.{star}
-
-|===
+:star: *
+:nuget: https://www.nuget.org/packages
+
+|===
+|Integration name |NuGet package version(s) |Assembly version(s) 
+.2+.^|AdoNet
+|part of .NET
+|System.Data 4.0.0 - 4.{star}.{star}
+
+|part of .NET
+|System.Data.Common 4.0.0 - 5.{star}.{star}
+
+.1+.^|AspNet
+|part of .NET Framework
+|System.Web 4.0.0 - 4.{star}.{star}
+
+.1+.^|Kafka
+|{nuget}/Confluent.Kafka[Confluent.Kafka 1.4.0 - 1.{star}.{star}]
+|Confluent.Kafka 1.4.0 - 1.{star}.{star}
+
+.1+.^|MySqlCommand
+|{nuget}/MySql.Data[MySql.Data 6.7.0 - 8.{star}.{star}]
+|MySql.Data 6.7.0 - 8.{star}.{star}
+
+.1+.^|NpgsqlCommand
+|{nuget}/Npgsql[Npgsql 4.0.0 - 5.{star}.{star}]
+|Npgsql 4.0.0 - 5.{star}.{star}
+
+.2+.^|OracleCommand
+|{nuget}/Oracle.ManagedDataAccess[Oracle.ManagedDataAccess 12.2.1100 - 21.{star}.{star}]
+|Oracle.ManagedDataAccess 4.122.0 - 4.122.{star}
+
+|{nuget}/Oracle.ManagedDataAccess.Core[Oracle.ManagedDataAccess.Core 2.0.0 - 2.{star}.{star}]
+|Oracle.ManagedDataAccess 2.0.0 - 2.{star}.{star}
+
+.1+.^|RabbitMQ
+|{nuget}/RabbitMQ.Client[RabbitMQ.Client 3.6.9 - 6.{star}.{star}]
+|RabbitMQ.Client 3.6.9 - 6.{star}.{star}
+
+.3+.^|SqlCommand
+|part of .NET
+|System.Data 4.0.0 - 4.{star}.{star}
+
+|{nuget}/System.Data.SqlClient[System.Data.SqlClient 4.0.0 - 4.{star}.{star}]
+|System.Data.SqlClient 4.0.0 - 4.{star}.{star}
+
+|{nuget}/Microsoft.Data.SqlClient[Microsoft.Data.SqlClient 1.0.0 - 2.{star}.{star}]
+|Microsoft.Data.SqlClient 1.0.0 - 2.{star}.{star}
+
+.2+.^|SqliteCommand
+|{nuget}/Microsoft.Data.Sqlite[Microsoft.Data.Sqlite 2.0.0 - 5.{star}.{star}]
+|Microsoft.Data.Sqlite 2.0.0 - 5.{star}.{star}
+
+|{nuget}/System.Data.SQLite[System.Data.SQLite 1.0.0 - 2.{star}.{star}]
+|System.Data.SQLite 1.0.0 - 2.{star}.{star}
+
+|===
diff --git a/docs/supported-technologies.asciidoc b/docs/supported-technologies.asciidoc
@@ -157,6 +157,10 @@ We support automatic instrumentation for the following messaging systems
 |See profiler documentation
 |<<setup-auto-instrumentation, Profiler auto instrumentation>>
 
+|RabbitMQ added[1.12]
+|See profiler documentation
+|<<setup-auto-instrumentation, Profiler auto instrumentation>>
+
 |===
 
 [float]

diff --git a/docs/upgrading.asciidoc b/docs/upgrading.asciidoc
@@ -21,6 +21,8 @@ The table below is a simplified description of this policy.
 [options="header"]
 |====
 |Agent version |EOL Date |Maintained until
+|1.12.x |2023-05-11 |1.13.0
+|1.11.x |2022-12-29 |1.12.0
 |1.10.x |2022-11-28 |1.11.0
 |1.9.x  |2022-10-07 |1.10.0
 |1.8.x  |2022-08-17 |1.9.0

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,10 +2,10 @@
   <!-- Src Directory Build Properties -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <PropertyGroup>
-    <AssemblyVersion>1.11.1</AssemblyVersion>
-    <InformationalVersion>1.11.1</InformationalVersion>
-    <FileVersion>1.11.1</FileVersion>
-    <VersionPrefix>1.11.1</VersionPrefix>
+    <AssemblyVersion>1.12.0</AssemblyVersion>
+    <InformationalVersion>1.12.0</InformationalVersion>
+    <FileVersion>1.12.0</FileVersion>
+    <VersionPrefix>1.12.0</VersionPrefix>
     <Authors>Elastic and contributors</Authors>
     <Copyright>2021 Elasticsearch BV</Copyright>
     <PackageProjectUrl>https://github.com/elastic/apm-agent-dotnet</PackageProjectUrl>

diff --git a/src/Elastic.Apm.Profiler.IntegrationsGenerator/Program.cs b/src/Elastic.Apm.Profiler.IntegrationsGenerator/Program.cs
@@ -144,7 +144,7 @@ private static string GenerateAsciidoc(IEnumerable<Integration> integrations)
 							var nugetParts = integrationMethod.Key.Nuget.Split(' ', 2);
 							nuget = nugetParts.Length == 1
 								? $"{{nuget}}/{integrationMethod.Key.Nuget}[{integrationMethod.Key.Nuget} {versionRange}]"
-								: $"{{nuget}}/{nugetParts[0]}[{nugetParts[0]} {nugetParts[1]}]";
+								: $"{{nuget}}/{nugetParts[0]}[{nugetParts[0]} {nugetParts[1].Replace("*", "{star}")}]";
 						}
 					}
 					else