Merge branch 'main' into update-schema-to-weaver

lmolkova · Sep 17, 2024 · d416d5e · d416d5e
2 parents bc7c6c4 + 5ca4891
commit d416d5e
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -221,8 +221,8 @@ During the release process, all `./.chloggen/*.yaml` files are transcribed into
 1. Create an entry file using `make chlog-new`. The command generates a new file,
    with its name based on the current branch (e.g. `./.chloggen/my-feature-xyz.yaml`)
 2. Fill in all the fields in the generated file
-3. The value for the `component` field MUST match a filename (without type) in the
-   [registry](https://github.com/open-telemetry/semantic-conventions/tree/main/model/registry)
+3. The value for the `component` field MUST match a folder name in the
+   [model](https://github.com/open-telemetry/semantic-conventions/tree/main/model) directory
    (e.g. `browser`, `http`)
 4. Run `make chlog-validate` to ensure the new file is valid
 5. Commit and push the file

diff --git a/...rioid/deprecated/registry-deprecated.yaml → ...droid/deprecated/registry-deprecated.yaml b/...rioid/deprecated/registry-deprecated.yaml → ...droid/deprecated/registry-deprecated.yaml
diff --git a/model/andrioid/registry.yaml → model/android/registry.yaml b/model/andrioid/registry.yaml → model/android/registry.yaml
diff --git a/model/andrioid/resources.yaml → model/android/resources.yaml b/model/andrioid/resources.yaml → model/android/resources.yaml
diff --git a/model/graphgl/registry.yaml → model/graphql/registry.yaml b/model/graphgl/registry.yaml → model/graphql/registry.yaml
diff --git a/model/graphgl/spans.yml → model/graphql/spans.yml b/model/graphgl/spans.yml → model/graphql/spans.yml