Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
gregkalapos committed Jun 2, 2022
2 parents fa7c2d3 + 2dabb05 commit 5902581
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@ endif::[]
[[release-notes-1.x]]
=== .NET Agent version 1.x
[[release-notes-1.16.0]]
==== 1.16.0
[float]
===== Features
- {pull}1726[#1726] Automatic capturing of incoming HTTP Requests on ASP.NET Core with the Profiler based agent (issue: {issue}1610[#1610]).
===== Bug fixes
- {pull}1725[#1725] By disabling `system.cpu.total.norm.pct`, the agent won't create any instance of the `PerformanceCounter` type (workaround for issue: {issue}1724[#1724])
- {pull}1723[#1723] Transaction names for incoming HTTP requests returning 404 but matching a valid route, will include the URL path instead of using `unknown route` (issue: {issue}1715[#1715]).
[[release-notes-1.15.0]]
==== 1.15.0
Expand Down
8 changes: 4 additions & 4 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- Src Directory Build Properties -->
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<AssemblyVersion>1.15.0</AssemblyVersion>
<InformationalVersion>1.15.0</InformationalVersion>
<FileVersion>1.15.0</FileVersion>
<VersionPrefix>1.15.0</VersionPrefix>
<AssemblyVersion>1.16.0</AssemblyVersion>
<InformationalVersion>1.16.0</InformationalVersion>
<FileVersion>1.16.0</FileVersion>
<VersionPrefix>1.16.0</VersionPrefix>
<Authors>Elastic and contributors</Authors>
<Copyright>2022 Elasticsearch BV</Copyright>
<PackageProjectUrl>https://github.com/elastic/apm-agent-dotnet</PackageProjectUrl>
Expand Down
2 changes: 1 addition & 1 deletion src/elastic_apm_profiler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "elastic_apm_profiler"
version = "1.15.0-beta.1"
version = "1.16.0-beta.1"
edition = "2018"
authors = ["Elastic and Contributors"]
description = "Elastic APM .NET agent CLR profiler"
Expand Down

0 comments on commit 5902581

Please sign in to comment.