Skip to content

Commit

Permalink
Public preview preparation (grafana#47)
Browse files Browse the repository at this point in the history
  • Loading branch information
pyohannes authored Nov 9, 2023
1 parent 19cf951 commit 2843630
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 11 deletions.
7 changes: 2 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

## Unreleased

* Fixes exception when activating ASP.NET metrics instrumentation
* Fixes exception when activating OWIN tracing instrumentation
## 0.6.0-beta.1

## 0.1.6.0-beta

Released 2023-11-08
Released 2023-11-09

* Initial public preview release
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- markdownlint-disable -->
<p>
<img src="https://upload.wikimedia.org/wikipedia/commons/3/3b/Grafana_icon.svg" alt="Grafana logo" height="70"/ >
<img src="internal/img/Grafana_icon.png" alt="Grafana logo" height="70"/ >
<img src="https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png" alt="OpenTelemetry logo" width="70"/ >
</p>
<!-- markdownlint-enable -->
Expand Down
File renamed without changes.
Binary file added internal/img/Grafana_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 13 additions & 2 deletions src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@

<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.0;net462</TargetFrameworks>
<Description>Minimal Grafana distribution of OpenTelemetry .NET</Description>
<Nullable>disable</Nullable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

<!-- NuGet packaging properties -->
<Description>Minimal Grafana distribution of OpenTelemetry .NET</Description>
<Authors>Grafana Labs</Authors>
<Copyright>Copyright (c) Grafana Labs</Copyright>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>OpenTelemetry;Grafana;Metrics;Logs;Traces;Observability;Monitoring</PackageTags>
<PackageIcon>Grafana_icon.png</PackageIcon>
<PackageReleaseNotes>https://github.com/grafana/grafana-opentelemetry-dotnet/blob/main/CHANGELOG.md</PackageReleaseNotes>
<PackageProjectUrl>https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/</PackageProjectUrl>
<RepositoryUrl>https://github.com/grafana/grafana-opentelemetry-dotnet</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -44,4 +51,8 @@
</AssemblyAttribute>
</ItemGroup>

<ItemGroup>
<None Include="../../internal/img/Grafana_icon.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>

</Project>
17 changes: 14 additions & 3 deletions src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@

<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.0;net462</TargetFrameworks>
<Description>Full Grafana distribution of OpenTelemetry .NET</Description>
<Nullable>disable</Nullable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

<!-- NuGet packaging properties -->
<Description>Full Grafana distribution of OpenTelemetry .NET</Description>
<Authors>Grafana Labs</Authors>
<Copyright>Copyright (c) Grafana Labs</Copyright>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>OpenTelemetry;Grafana;Metrics;Logs;Traces;Observability;Monitoring</PackageTags>
<PackageIcon>Grafana_icon.png</PackageIcon>
<PackageReleaseNotes>https://github.com/grafana/grafana-opentelemetry-dotnet/blob/main/CHANGELOG.md</PackageReleaseNotes>
<PackageProjectUrl>https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/</PackageProjectUrl>
<RepositoryUrl>https://github.com/grafana/grafana-opentelemetry-dotnet</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
</PropertyGroup>

<!--
Expand Down Expand Up @@ -68,6 +75,10 @@
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Grafana.OpenTelemetry.Tests</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
</ItemGroup>

<ItemGroup>
<None Include="../../internal/img/Grafana_icon.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>

</Project>

0 comments on commit 2843630

Please sign in to comment.