Skip to content

Commit 9a6d3b0

Browse files
russcamrusscam
authored
Prepare for 1.12.0 release (#1560)
1 parent 99377bb commit 9a6d3b0

File tree

10 files changed

+240
-190
lines changed

10 files changed

+240
-190
lines changed

‎CHANGELOG.asciidoc

+34
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,40 @@ endif::[]
2323
[[release-notes-1.x]]
2424
=== .NET Agent version 1.x
2525
26+
[[release-notes-1.12.0]]
27+
==== 1.12.0
28+
29+
[float]
30+
===== Breaking changes
31+
32+
- {pull}1520[#1520] Auto-infer destination.service.resource and adapt public API (issues: {issue}1330[#1330])
33+
+
34+
`boolean` `isExitSpan` parameter introduced to Start* and Capture* public APIs to denote when a span
35+
is an exit span.
36+
37+
[float]
38+
===== Features
39+
40+
- {pull}1511[#1511] Implement Dropped span statistics
41+
- {pull}1515[#1515] Ignore duplicate Diagnostic listener subscriptions (issue: {issue}1119[#1119])
42+
- {pull}1518[#1518] Implement User-Agent spec for .NET agent (issue: #1517)
43+
- {pull}1525[#1525] Add message related properties to transactions and spans (issue: {issue}1512[#1512])
44+
- {pull}1534[#1534] Add profiler auto instrumentation (issue: {issue}1522[#1522])
45+
- {pull}1548[#1548] Add profiler auto instrumentation for RabbitMQ (issue: {issue}1223[#1223])
46+
- {pull}1528[#1528] Platform detection: Handle .NET 6 (issue: {issue}1513[#1513])
47+
- {pull}1492[#1492] Remove use of Socket.Encrypted to determine secure
48+
- {pull}1520[#1520] Auto-infer destination.service.resource and adapt public API (issues: {issue}1330[#1330])
49+
- {pull}1540[#1540] Stop recording transaction metrics (issue: {issue}1523[#1523])
50+
51+
[float]
52+
===== Bug fixes
53+
54+
- {pull}1484[#1484] Capture spans for new Azure Storage SDKs (issue: {issue}1352[#1352])
55+
- {pull}1509[#1509] Use Environment.MachineName to get HostName (issue: {issue}1504[#1504])
56+
- {pull}1510[#1510] Check context is not null when sanitizing error request headers (issue: {issue}1503[#1503])
57+
- {pull}1536[#1536] Improve Performance counter handling for metrics on Windows (issue: {issue}1505[#1505])
58+
- {pull}1538[#1538] Collect .NET Framework GC metrics only when filtering supported (issue: {issue}1346[#1346])
59+
- {pull}1557[#1557] Handle enabled/recording=false configuration when capturing errors
2660
2761
[[release-notes-1.11.1]]
2862
==== 1.11.1

‎build/scripts/Build.fs

+11-4
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,16 @@ module Build =
256256

257257
/// Creates versioned elastic_apm_profiler.zip file containing all components needed for profiler auto-instrumentation
258258
let ProfilerZip (canary:bool) =
259-
let name = "elastic_apm_profiler"
259+
let name = "elastic_apm_profiler"
260+
let currentAssemblyVersion = Versioning.CurrentVersion.AssemblyVersion
260261
let versionedName =
261262
let os =
262263
if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then "win-x64"
263264
else "linux-x64"
264265
if canary then
265-
sprintf "%s_%s-%s-%s" name (Versioning.CurrentVersion.AssemblyVersion.ToString()) os versionSuffix
266+
sprintf "%s_%s-%s-%s" name (currentAssemblyVersion.ToString()) os versionSuffix
266267
else
267-
sprintf "%s_%s-%s" name (Versioning.CurrentVersion.AssemblyVersion.ToString()) os
268+
sprintf "%s_%s-%s" name (currentAssemblyVersion.ToString()) os
268269

269270
let profilerDir = Paths.BuildOutput name |> DirectoryInfo
270271
profilerDir.Create()
@@ -274,11 +275,17 @@ module Build =
274275
"target/release/elastic_apm_profiler.dll"
275276
"target/release/libelastic_apm_profiler.so"
276277
Paths.Src "elastic_apm_profiler/NOTICE"
278+
Paths.Src "elastic_apm_profiler/README"
277279
"LICENSE"
278280
}
279281
|> Seq.map FileInfo
280282
|> Seq.filter (fun file -> file.Exists)
281-
|> Seq.iter (fun file -> file.CopyTo(Path.combine profilerDir.FullName file.Name, true) |> ignore)
283+
|> Seq.iter (fun file ->
284+
let destination = Path.combine profilerDir.FullName file.Name
285+
let newFile = file.CopyTo(destination, true)
286+
if newFile.Name = "README" then
287+
File.applyReplace (fun s -> s.Replace("${VERSION}", sprintf "%i.%i" currentAssemblyVersion.Major currentAssemblyVersion.Minor)) newFile.FullName
288+
)
282289

283290
Directory.GetDirectories((Paths.BuildOutput "Elastic.Apm.Profiler.Managed"), "*", SearchOption.TopDirectoryOnly)
284291
|> Seq.map DirectoryInfo

‎docs/integrations.asciidoc

+57-57
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
1-
:star: *
2-
:nuget: https://www.nuget.org/packages
3-
4-
|===
5-
|Integration name |NuGet package version(s) |Assembly version(s)
6-
.2+.^|AdoNet
7-
|part of .NET
8-
|System.Data 4.0.0 - 4.{star}.{star}
9-
10-
|part of .NET
11-
|System.Data.Common 4.0.0 - 5.{star}.{star}
12-
13-
.1+.^|AspNet
14-
|part of .NET Framework
15-
|System.Web 4.0.0 - 4.{star}.{star}
16-
17-
.1+.^|Kafka
18-
|{nuget}/Confluent.Kafka[Confluent.Kafka 1.4.0 - 1.{star}.{star}]
19-
|Confluent.Kafka 1.4.0 - 1.{star}.{star}
20-
21-
.1+.^|MySqlCommand
22-
|{nuget}/MySql.Data[MySql.Data 6.7.0 - 8.{star}.{star}]
23-
|MySql.Data 6.7.0 - 8.{star}.{star}
24-
25-
.1+.^|NpgsqlCommand
26-
|{nuget}/Npgsql[Npgsql 4.0.0 - 5.{star}.{star}]
27-
|Npgsql 4.0.0 - 5.{star}.{star}
28-
29-
.2+.^|OracleCommand
30-
|{nuget}/Oracle.ManagedDataAccess[Oracle.ManagedDataAccess 12.2.1100 - 21.*.*]
31-
|Oracle.ManagedDataAccess 4.122.0 - 4.122.{star}
32-
33-
|{nuget}/Oracle.ManagedDataAccess.Core[Oracle.ManagedDataAccess.Core 2.0.0 - 2.{star}.{star}]
34-
|Oracle.ManagedDataAccess 2.0.0 - 2.{star}.{star}
35-
36-
.1+|RabbitMQ
37-
|{nuget}/RabbitMQ.Client[RabbitMQ.Client 3.6.9 - 6.{star}.{star}]
38-
|RabbitMQ.Client 3.6.9 - 6.{star}.{star}
39-
40-
.3+.^|SqlCommand
41-
|part of .NET
42-
|System.Data 4.0.0 - 4.{star}.{star}
43-
44-
|{nuget}/System.Data.SqlClient[System.Data.SqlClient 4.0.0 - 4.{star}.{star}]
45-
|System.Data.SqlClient 4.0.0 - 4.{star}.{star}
46-
47-
|{nuget}/Microsoft.Data.SqlClient[Microsoft.Data.SqlClient 1.0.0 - 2.{star}.{star}]
48-
|Microsoft.Data.SqlClient 1.0.0 - 2.{star}.{star}
49-
50-
.2+.^|SqliteCommand
51-
|{nuget}/Microsoft.Data.Sqlite[Microsoft.Data.Sqlite 2.0.0 - 5.{star}.{star}]
52-
|Microsoft.Data.Sqlite 2.0.0 - 5.{star}.{star}
53-
54-
|{nuget}/System.Data.SQLite[System.Data.SQLite 1.0.0 - 2.{star}.{star}]
55-
|System.Data.SQLite 1.0.0 - 2.{star}.{star}
56-
57-
|===
1+
:star: *
2+
:nuget: https://www.nuget.org/packages
3+
4+
|===
5+
|Integration name |NuGet package version(s) |Assembly version(s)
6+
.2+.^|AdoNet
7+
|part of .NET
8+
|System.Data 4.0.0 - 4.{star}.{star}
9+
10+
|part of .NET
11+
|System.Data.Common 4.0.0 - 5.{star}.{star}
12+
13+
.1+.^|AspNet
14+
|part of .NET Framework
15+
|System.Web 4.0.0 - 4.{star}.{star}
16+
17+
.1+.^|Kafka
18+
|{nuget}/Confluent.Kafka[Confluent.Kafka 1.4.0 - 1.{star}.{star}]
19+
|Confluent.Kafka 1.4.0 - 1.{star}.{star}
20+
21+
.1+.^|MySqlCommand
22+
|{nuget}/MySql.Data[MySql.Data 6.7.0 - 8.{star}.{star}]
23+
|MySql.Data 6.7.0 - 8.{star}.{star}
24+
25+
.1+.^|NpgsqlCommand
26+
|{nuget}/Npgsql[Npgsql 4.0.0 - 5.{star}.{star}]
27+
|Npgsql 4.0.0 - 5.{star}.{star}
28+
29+
.2+.^|OracleCommand
30+
|{nuget}/Oracle.ManagedDataAccess[Oracle.ManagedDataAccess 12.2.1100 - 21.{star}.{star}]
31+
|Oracle.ManagedDataAccess 4.122.0 - 4.122.{star}
32+
33+
|{nuget}/Oracle.ManagedDataAccess.Core[Oracle.ManagedDataAccess.Core 2.0.0 - 2.{star}.{star}]
34+
|Oracle.ManagedDataAccess 2.0.0 - 2.{star}.{star}
35+
36+
.1+.^|RabbitMQ
37+
|{nuget}/RabbitMQ.Client[RabbitMQ.Client 3.6.9 - 6.{star}.{star}]
38+
|RabbitMQ.Client 3.6.9 - 6.{star}.{star}
39+
40+
.3+.^|SqlCommand
41+
|part of .NET
42+
|System.Data 4.0.0 - 4.{star}.{star}
43+
44+
|{nuget}/System.Data.SqlClient[System.Data.SqlClient 4.0.0 - 4.{star}.{star}]
45+
|System.Data.SqlClient 4.0.0 - 4.{star}.{star}
46+
47+
|{nuget}/Microsoft.Data.SqlClient[Microsoft.Data.SqlClient 1.0.0 - 2.{star}.{star}]
48+
|Microsoft.Data.SqlClient 1.0.0 - 2.{star}.{star}
49+
50+
.2+.^|SqliteCommand
51+
|{nuget}/Microsoft.Data.Sqlite[Microsoft.Data.Sqlite 2.0.0 - 5.{star}.{star}]
52+
|Microsoft.Data.Sqlite 2.0.0 - 5.{star}.{star}
53+
54+
|{nuget}/System.Data.SQLite[System.Data.SQLite 1.0.0 - 2.{star}.{star}]
55+
|System.Data.SQLite 1.0.0 - 2.{star}.{star}
56+
57+
|===

‎docs/supported-technologies.asciidoc

+4
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,10 @@ We support automatic instrumentation for the following messaging systems
157157
|See profiler documentation
158158
|<<setup-auto-instrumentation, Profiler auto instrumentation>>
159159

160+
|RabbitMQ added[1.12]
161+
|See profiler documentation
162+
|<<setup-auto-instrumentation, Profiler auto instrumentation>>
163+
160164
|===
161165

162166
[float]

‎docs/upgrading.asciidoc

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ The table below is a simplified description of this policy.
2121
[options="header"]
2222
|====
2323
|Agent version |EOL Date |Maintained until
24+
|1.12.x |2023-05-11 |1.13.0
25+
|1.11.x |2022-12-29 |1.12.0
2426
|1.10.x |2022-11-28 |1.11.0
2527
|1.9.x |2022-10-07 |1.10.0
2628
|1.8.x |2022-08-17 |1.9.0

‎src/Directory.Build.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!-- Src Directory Build Properties -->
33
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
44
<PropertyGroup>
5-
<AssemblyVersion>1.11.1</AssemblyVersion>
6-
<InformationalVersion>1.11.1</InformationalVersion>
7-
<FileVersion>1.11.1</FileVersion>
8-
<VersionPrefix>1.11.1</VersionPrefix>
5+
<AssemblyVersion>1.12.0</AssemblyVersion>
6+
<InformationalVersion>1.12.0</InformationalVersion>
7+
<FileVersion>1.12.0</FileVersion>
8+
<VersionPrefix>1.12.0</VersionPrefix>
99
<Authors>Elastic and contributors</Authors>
1010
<Copyright>2021 Elasticsearch BV</Copyright>
1111
<PackageProjectUrl>https://github.com/elastic/apm-agent-dotnet</PackageProjectUrl>

‎src/Elastic.Apm.Profiler.IntegrationsGenerator/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private static string GenerateAsciidoc(IEnumerable<Integration> integrations)
144144
var nugetParts = integrationMethod.Key.Nuget.Split(' ', 2);
145145
nuget = nugetParts.Length == 1
146146
? $"{{nuget}}/{integrationMethod.Key.Nuget}[{integrationMethod.Key.Nuget} {versionRange}]"
147-
: $"{{nuget}}/{nugetParts[0]}[{nugetParts[0]} {nugetParts[1]}]";
147+
: $"{{nuget}}/{nugetParts[0]}[{nugetParts[0]} {nugetParts[1].Replace("*", "{star}")}]";
148148
}
149149
}
150150
else

0 commit comments

Comments
 (0)