Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto-generated Semantic Conventions #2069

Merged
merged 43 commits into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7e2b190
Introduce SemanticConventions project
joaopgrassi May 24, 2021
4a0305f
Merge branch 'main' into feat/autogen_semconv
cijothomas Oct 18, 2021
a26aa03
Merge branch 'main' into feat/autogen_semconv
cijothomas Oct 19, 2021
03ffc5d
Add missing PublicAPI entries
joaopgrassi Oct 20, 2021
00dfd83
Add auto-generated to template
joaopgrassi Oct 20, 2021
3e0f044
Update files
joaopgrassi Oct 20, 2021
6298fe0
Fix resource semconv specification URL
joaopgrassi Oct 20, 2021
9fe5607
Fix markdown issues
joaopgrassi Oct 20, 2021
3abccc5
PR fixes and using the dotnet format tool
joaopgrassi Oct 22, 2021
546fc19
Fix trailing space in remarks
joaopgrassi Oct 22, 2021
9f77cf4
Adapt bash script and README
joaopgrassi Oct 26, 2021
a179623
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Oct 27, 2021
7a78dfe
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Nov 2, 2021
6ea49ef
Add support for prefixes and event name
joaopgrassi Nov 5, 2021
e8e5cf2
Merge branch 'feat/autogen_semconv' of github.com:joaopgrassi/opentel…
joaopgrassi Nov 5, 2021
356b406
Merge remote-tracking branch 'upstream/main' into feat/autogen_semconv
joaopgrassi Nov 5, 2021
89b189f
Update public api files
joaopgrassi Nov 5, 2021
5837c79
Missing fixed .sln after merge conflict resolution
joaopgrassi Nov 5, 2021
1d3e949
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Jan 10, 2022
f94fb9f
Improve prefix and event attr generation template
joaopgrassi Feb 5, 2022
2f16f30
Use format from .NET SDK
joaopgrassi Feb 5, 2022
4c991c3
Re-generate after template changes
joaopgrassi Feb 5, 2022
9c91f90
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Feb 5, 2022
5ee7692
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Feb 15, 2022
2bed012
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Jun 29, 2022
38b3846
Improve whitespace in the template
joaopgrassi Jun 29, 2022
fe2778e
Adapt script
joaopgrassi Jul 25, 2022
1a2a971
Merge branch 'main' into feat/autogen_semconv
cijothomas Sep 2, 2022
5d6b064
Merge branch 'main' into feat/autogen_semconv
cijothomas Sep 2, 2022
99de7b6
Bump tool version and format remarks better
joaopgrassi Sep 6, 2022
28f921f
Escape chars in remarks
joaopgrassi Sep 6, 2022
b9880f1
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Sep 6, 2022
3b99dc8
Merge branch 'main' into feat/autogen_semconv
cijothomas Sep 21, 2022
c558b57
Use spec version 1.13, net462, update PublicApi files
joaopgrassi Sep 26, 2022
cf422d9
Appease build with missing blank line
joaopgrassi Sep 26, 2022
d850232
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Sep 26, 2022
af99f52
Merge branch 'main' into feat/autogen_semconv
cijothomas Sep 30, 2022
6494bd4
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Oct 3, 2022
7cbfc4c
Merge branch 'main' into feat/autogen_semconv
cijothomas Oct 10, 2022
3d7956b
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Oct 18, 2022
110db72
Merge branch 'main' into feat/autogen_semconv
cijothomas Oct 18, 2022
d3af237
Merge branch 'main' into feat/autogen_semconv
cijothomas Oct 18, 2022
459cf85
Merge branch 'main' into feat/autogen_semconv
joaopgrassi Oct 19, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions OpenTelemetry.proj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@

<!-- Windows specific projects -->
<PackProjects Remove="src\OpenTelemetry.Instrumentation.AspNet\OpenTelemetry.Instrumentation.AspNet.csproj" Condition="'$(OS)' != 'Windows_NT'" />

<!-- Not pack SemanticConventions project for now -->
<SolutionProjects Remove="src\OpenTelemetry.SemanticConventions\OpenTelemetry.SemanticConventions.csproj" />
<PackProjects Remove="src\OpenTelemetry.SemanticConventions\OpenTelemetry.SemanticConventions.csproj" Condition="'$(OS)' != 'Windows_NT'" />

</ItemGroup>

<Target Name="Build">
Expand Down
6 changes: 6 additions & 0 deletions OpenTelemetry.sln
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.Exporter.Open
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp.AspNetCore.6.0", "test\TestApp.AspNetCore.6.0\TestApp.AspNetCore.6.0.csproj", "{0076C657-564F-4787-9FFF-52D9D55166E8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.SemanticConventions", "src\OpenTelemetry.SemanticConventions\OpenTelemetry.SemanticConventions.csproj", "{D4519DF6-CC72-4AC4-A851-E21383098D11}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -466,6 +468,10 @@ Global
{0076C657-564F-4787-9FFF-52D9D55166E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0076C657-564F-4787-9FFF-52D9D55166E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0076C657-564F-4787-9FFF-52D9D55166E8}.Release|Any CPU.Build.0 = Release|Any CPU
{D4519DF6-CC72-4AC4-A851-E21383098D11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4519DF6-CC72-4AC4-A851-E21383098D11}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4519DF6-CC72-4AC4-A851-E21383098D11}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4519DF6-CC72-4AC4-A851-E21383098D11}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
12 changes: 12 additions & 0 deletions src/OpenTelemetry.SemanticConventions/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-format": {
"version": "5.1.250801",
"commands": [
"dotnet-format"
]
}
}
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
joaopgrassi marked this conversation as resolved.
Show resolved Hide resolved
<Description>OpenTelemetry Semantic Conventions</Description>
<PackageTags>$(PackageTags);semantic-conventions</PackageTags>
</PropertyGroup>

</Project>
46 changes: 46 additions & 0 deletions src/OpenTelemetry.SemanticConventions/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Semantic Conventions for OpenTelemetry .NET

This project contains the generated code for the Semantic Conventions
defined by the OpenTelemetry specification.

## Installation

```shell
dotnet add package OpenTelemetry.SemanticConventions
```

## Generating the files

This project uses the
[Semantic Convention Generator](https://github.com/open-telemetry/build-tools/blob/main/semantic-conventions/README.md).
The folder `scripts` at the top level of the project contains
the templates and the script file used in the process.

To generate the code files, run:

```shell
./scripts/semantic-convetion/generate.sh
```

Or, with PowerShell:

```shell
./scripts/semantic-convetion/generate.ps1
```

### dotnet-format

The script installs and runs the [dotnet format](https://github.com/dotnet/format)
tool after the `.cs` files are generated. It will apply fixes for whitespaces,
code style and analyzer warnings.

### Updating PublicAPI files

Because the script runs `dotnet-format`, the PublicAPI files **will be
updated automatically**, as the tool fixes warnings for analyzers
([RS0016](https://github.com/dotnet/roslyn-analyzers/issues/3229)).

## References

* [OpenTelemetry Project](https://opentelemetry.io/)
* [Build tools](https://github.com/open-telemetry/build-tools)
Loading