Skip to content

Commit

Permalink
Merge commit 'c53f76f661a98836f824d27d33b5f4b24dfa5bc4' into cf-resource
Browse files Browse the repository at this point in the history
Adjusts group type of cloudfoundry from `resource` to `attribute_group`.
Regenerated tables and attribute registry.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
  • Loading branch information
KarstenSchnitter committed May 24, 2024
2 parents d20c70f + c53f76f commit d77ec4b
Show file tree
Hide file tree
Showing 251 changed files with 12,395 additions and 4,103 deletions.
4 changes: 0 additions & 4 deletions .chloggen/814.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions .chloggen/862.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions .chloggen/863.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions .chloggen/866.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions .chloggen/870.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions .chloggen/875.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions .chloggen/890.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions .chloggen/894.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .chloggen/first-gen-ai.yaml → .chloggen/go-runtime-metrics.yaml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
change_type: new_component

# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
component: gen-ai
component: go

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Introducing semantic conventions for GenAI clients.
note: Add new go namespace for Go runtime metrics

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
# The values here must be integers.
issues: [327]
issues: [535]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
Expand Down
6 changes: 3 additions & 3 deletions .chloggen/564.yaml → .chloggen/k8s-waiting-status.yaml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
change_type: enhancement

# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
component: process
component: "k8s"

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add additional attributes to process attribute registry
note: "add k8s.container.status.current_waiting_reason resource attribute"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
# The values here must be integers.
issues: [564]
issues: [996]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
Expand Down
22 changes: 0 additions & 22 deletions .chloggen/rpc_registry.yaml

This file was deleted.

19 changes: 5 additions & 14 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@
/model/registry/url.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
/model/registry/user-agent.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
/docs/http/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
/docs/attribute-registry/http.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
/docs/attribute-registry/server.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
/docs/attribute-registry/client.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
/docs/attribute-registry/network.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
/docs/attribute-registry/error.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
/docs/attribute-registry/url.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
/docs/attribute-registry/user-agent.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers

# System semantic conventions approvers
/docs/system/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers
Expand All @@ -62,27 +55,25 @@

# K8s semantic conventions approvers
/docs/resource/k8s.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
/docs/attributes-registry/k8s.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
/model/resource/k8s.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
/model/registry/k8s.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers

# Container semantic conventions approvers
/docs/resource/container.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
/docs/attributes-registry/container.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
/docs/attributes-registry/oci.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
/model/resource/container.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
/model/registry/container.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
/model/registry/oci.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers

# .NET semantic conventions approvers
/model/metrics/dotnet/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers
/docs/dotnet/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers
/model/registry/aspnetcore.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers
/model/registry/signalr.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers
/docs/dotnet/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers

# Gen-AI semantic conventions approvers
/model/registry/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
/model/metrics/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
/model/registry/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
/model/metrics/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
/model/trace/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
/docs/gen-ai/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
/docs/attributes-registry/llm.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers

# TODO - Add semconv area experts
7 changes: 6 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ body:
# DO NOT manually edit it.
# Start semconv area list
- area:android
- area:aspnetcore
- area:aws
- area:browser
- area:client
Expand All @@ -42,12 +43,14 @@ body:
- area:file
- area:gcp
- area:gen-ai
- area:go
- area:graphql
- area:heroku
- area:host
- area:http
- area:ios
- area:jvm
- area:k8s
- area:log
- area:messaging
- area:network
- area:oci
Expand All @@ -60,7 +63,9 @@ body:
- area:server
- area:service
- area:session
- area:signalr
- area:source
- area:system
- area:telemetry
- area:thread
- area:tls
Expand Down
7 changes: 6 additions & 1 deletion .github/ISSUE_TEMPLATE/change_proposal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ body:
# DO NOT manually edit it.
# Start semconv area list
- area:android
- area:aspnetcore
- area:aws
- area:browser
- area:client
Expand All @@ -35,12 +36,14 @@ body:
- area:file
- area:gcp
- area:gen-ai
- area:go
- area:graphql
- area:heroku
- area:host
- area:http
- area:ios
- area:jvm
- area:k8s
- area:log
- area:messaging
- area:network
- area:oci
Expand All @@ -53,7 +56,9 @@ body:
- area:server
- area:service
- area:session
- area:signalr
- area:source
- area:system
- area:telemetry
- area:thread
- area:tls
Expand Down
7 changes: 6 additions & 1 deletion .github/ISSUE_TEMPLATE/new-conventions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ body:
# DO NOT manually edit it.
# Start semconv area list
- area:android
- area:aspnetcore
- area:aws
- area:browser
- area:client
Expand All @@ -44,12 +45,14 @@ body:
- area:file
- area:gcp
- area:gen-ai
- area:go
- area:graphql
- area:heroku
- area:host
- area:http
- area:ios
- area:jvm
- area:k8s
- area:log
- area:messaging
- area:network
- area:oci
Expand All @@ -62,7 +65,9 @@ body:
- area:server
- area:service
- area:session
- area:signalr
- area:source
- area:system
- area:telemetry
- area:thread
- area:tls
Expand Down
23 changes: 9 additions & 14 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,27 +70,22 @@ jobs:
- name: run misspell
run: make misspell

docfx:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x

- name: install docfx
run: dotnet tool update -g docfx --version "3.0.0-*" --add-source https://docfx.pkgs.visualstudio.com/docfx/_packaging/docs-public-packages/nuget/v3/index.json

- name: run docfx
run: docfx build --dry-run

semantic-conventions:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: verify semantic convention tables
run: make table-check

semantic-conventions-registry:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: verify registry tables
run: |
make attribute-registry-generation
git diff --exit-code './docs/attributes-registry/*.md' || (echo 'Attribute registry markdown is out of date, please run "make attribute-registry-generation" and commit the changes in this PR.' && exit 1)
semantic-conventions-compatibility:
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
.project
.settings
bin
.vs

# NetBeans
/.nb-gradle
Expand All @@ -30,4 +31,7 @@ node_modules/
package-lock.json

# Visual Studio Code
.vscode
.vscode

# Visual Studio
.vs/
11 changes: 11 additions & 0 deletions .markdown_link_check_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"ignorePatterns": [
{
"pattern": "^https://github\\.com/open-telemetry/opentelemetry-specification/(issues|pull)"
},
{
"pattern": "^https://github\\.com/open-telemetry/semantic-conventions/(issues|pull)"
}
],
"replacementPatterns": [
Expand All @@ -14,6 +17,14 @@
"replacement": "LINK-CHECK-ERROR-USE-LOCAL-PATH-TO-DOC-PAGE-NOT-EXTERNAL-URL/"
}
],
"httpHeaders": [
{
"urls": ["http", ".", "/"],
"headers": {
"User-Agent": "Mozilla/5.0 (compatible; OpenTelemetryDocsBot/1.0)"
}
}
],
"retryOn429": true,
"timeout": "30s",
"aliveStatusCodes": [200, 403]
Expand Down
4 changes: 4 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ ol-prefix:
style: ordered
no-inline-html: false
fenced-code-language: false
no-space-in-code: false
first-line-h1: false
no-duplicate-heading:
siblings_only: true
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
/docs/**
!/docs/cloud*
!/docs/cloud*/**
!/docs/attributes-registry*
!/docs/attributes-registry*/**
/model
/schemas
CHANGELOG.md
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"yaml.schemas": {
"https://raw.githubusercontent.com/open-telemetry/build-tools/v0.24.0/semantic-conventions/semconv.schema.json": [
"model/**/*.yaml",
"model/**/*.yaml"
]
},
"json.schemaDownload.enable": true
Expand Down
Loading

0 comments on commit d77ec4b

Please sign in to comment.