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

[repo] Move OpenTelemetry.SemanticConventions project from main repo #1672

Merged
merged 30 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3ec6459
Reintroduce OpenTelemetry.SemanticConventions project
joegoldman2 Apr 21, 2024
cc1572b
Cleanup generate script
joegoldman2 Apr 21, 2024
0882491
Fix max line length warning
joegoldman2 Apr 21, 2024
b7db123
Fix link in README.md
joegoldman2 Apr 21, 2024
053aae4
Rollback to open-telemetry/opentelemetry-specification v1.13.0
joegoldman2 Apr 21, 2024
ffa9c47
Move to latest spec version
joegoldman2 Apr 23, 2024
d9bd2dd
Merge branch 'main' into fix/1657
joegoldman2 Apr 23, 2024
0ed1d85
Fix TFM
joegoldman2 Apr 23, 2024
dc23981
Addressing feedback from review
joegoldman2 Apr 23, 2024
40ad259
Fix link in README
joegoldman2 Apr 23, 2024
cb87a88
Move PublicAPI.*.txt to .publicApi
joegoldman2 Apr 23, 2024
6993bba
Add changelog file
joegoldman2 Apr 23, 2024
a7ce581
Add CI/infra
joegoldman2 Apr 24, 2024
82f1fd5
Remove prefixes
joegoldman2 Apr 24, 2024
232cc15
Add missing using directive
joegoldman2 Apr 24, 2024
2803ddd
Merge branch 'main' into fix/1657
joegoldman2 Apr 24, 2024
42eabd8
Add missing target
joegoldman2 Apr 24, 2024
f591be6
Add missing files in sln
joegoldman2 Apr 24, 2024
69d1326
Group attributes by the root namespace
joegoldman2 Apr 24, 2024
fffdf41
Move to file-scoped namespace
joegoldman2 Apr 24, 2024
776ebe6
Attempt to skip code coverage steps if no tests are run.
CodeBlanch Apr 24, 2024
11ca969
Move *Attributes.cs to Attributes folder
joegoldman2 Apr 24, 2024
5279d65
Swap file checks for code coverage upload.
CodeBlanch Apr 24, 2024
30e8b48
Merge branch 'fix/1657' of https://github.com/joegoldman2/opentelemet…
CodeBlanch Apr 24, 2024
1555617
Tweak file check.
CodeBlanch Apr 24, 2024
01568a1
Fix warning about recursive option to dotnet-coverage merge being obs…
CodeBlanch Apr 24, 2024
09cafa5
Fix yml in codecov definitions.
CodeBlanch Apr 24, 2024
f5210b7
Update codecov for new flag.
CodeBlanch Apr 24, 2024
906114d
Merge branch 'main' into fix/1657
CodeBlanch Apr 24, 2024
22f9809
Get rid of print_value macro
joegoldman2 Apr 24, 2024
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
9 changes: 8 additions & 1 deletion opentelemetry-dotnet-contrib.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31912.275
MinimumVisualStudioVersion = 15.0.26124.0
Expand Down Expand Up @@ -347,6 +347,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTelemetry.ResourceDetec
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.PersistentStorage.Abstractions.Tests", "test\OpenTelemetry.PersistentStorage.Abstractions.Tests\OpenTelemetry.PersistentStorage.Abstractions.Tests.csproj", "{7AD707F9-DC6D-430A-8834-D5DCD517BF6E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.SemanticConventions", "src\OpenTelemetry.SemanticConventions\OpenTelemetry.SemanticConventions.csproj", "{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -693,6 +695,10 @@ Global
{7AD707F9-DC6D-430A-8834-D5DCD517BF6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7AD707F9-DC6D-430A-8834-D5DCD517BF6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7AD707F9-DC6D-430A-8834-D5DCD517BF6E}.Release|Any CPU.Build.0 = Release|Any CPU
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -796,6 +802,7 @@ Global
{033CA8D4-1529-413A-B244-07958D5F9A48} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
{36271347-2055-438E-9659-B71542A17A73} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
{7AD707F9-DC6D-430A-8834-D5DCD517BF6E} = {2097345F-4DD3-477D-BC54-A922F9B2B402}
{BC1959E3-164E-42AE-AE1C-DE2E3046E27C} = {22DF5DC0-1290-4E83-A9D8-6BB7DE3B3E63}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B0816796-CDB3-47D7-8C3C-946434DE3B66}
Expand Down
Empty file.

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions src/OpenTelemetry.SemanticConventions/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Changelog

## Unreleased

* Updated to `1.25.0` release of OpenTelemetry Semantic Conventions.
([#1672](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1672))

* Moved from `https://github.com/open-telemetry/opentelemetry-dotnet/` to
`https://github.com/open-telemetry/opentelemetry-dotnet-contrib/`.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>OpenTelemetry Semantic Conventions</Description>
<PackageTags>$(PackageTags);semantic-conventions</PackageTags>
<MinVerTagPrefix>SemanticConventions-</MinVerTagPrefix>
<IsPackable>false</IsPackable>
</PropertyGroup>
joegoldman2 marked this conversation as resolved.
Show resolved Hide resolved

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

This project contains the generated code for the [Semantic Conventions](https://github.com/open-telemetry/semantic-conventions)
defined by the OpenTelemetry specification.

## Installation

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

## 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 template
and the script files used in the process.

To generate the code files, run:

```shell
./scripts/generate.sh
```

Or, with PowerShell:

```shell
./scripts/generate.ps1
```

## References

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