Skip to content

Commit

Permalink
Merge branch 'main' into profile-frame-type-beam
Browse files Browse the repository at this point in the history
  • Loading branch information
lmolkova authored Jan 23, 2025
2 parents ffee963 + bfe6e1e commit e3b73a1
Show file tree
Hide file tree
Showing 108 changed files with 1,344 additions and 593 deletions.
22 changes: 22 additions & 0 deletions .chloggen/.oracle_cloud.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Use this changelog template to create an entry for release notes.
#
# If your change doesn't affect end users you should instead start
# your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add Oracle Cloud Infrastructure to Semantic Conventions

# 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: [1658]

# (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.
# Use pipe (|) for multiline entries.
subtext:
2 changes: 1 addition & 1 deletion .chloggen/1655.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
change_type: enhancement

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: |
Expand Down
4 changes: 4 additions & 0 deletions .chloggen/1716.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
change_type: enhancement
component: docs, db
note: Add common guidance for recording errors on spans and metrics, clarify DB conventions.
issues: [1516, 1536, 1716]
2 changes: 1 addition & 1 deletion .chloggen/1719.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
change_type: enhancement

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Adds `mistral_ai` as a `gen_ai.system` attribute value.
Expand Down
22 changes: 22 additions & 0 deletions .chloggen/add_k8s_ns_phase.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Use this changelog template to create an entry for release notes.
#
# If your change doesn't affect end users you should instead start
# your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add k8s.namespace.phase metric along with the respective 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: [1668]

# (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.
# Use pipe (|) for multiline entries.
subtext:
4 changes: 4 additions & 0 deletions .chloggen/rabbitmq-destination-name.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
change_type: breaking
component: messaging
note: "RabbitMQ: Specify how to populate `messaging.destination.name`"
issues: [1529]
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
/model/os/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers
/model/process/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers @open-telemetry/semconv-security-approvers
/model/system/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers
/docs/non-normative/groups/system @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers

# Mobile semantic conventions
/docs/mobile/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-mobile-approvers
Expand Down Expand Up @@ -109,6 +110,10 @@
/docs/feature-flags/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-feature-flag-approvers
/model/feature-flags/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-feature-flag-approvers

# Profiling semantic conventions
/docs/general/profiles.md @open-telemetry/specs-semconv-approvers @open-telemetry/profiling-approvers
/model/profile/ @open-telemetry/specs-semconv-approvers @open-telemetry/profiling-approvers

# Tooling
/policies/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers
/policies_test/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers
Expand Down
29 changes: 8 additions & 21 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Bug report
description: Create a report to help us improve
labels: ["bug", "triage:needs-triage"]
labels: ["bug"]
body:
- type: markdown
attributes:
Expand All @@ -15,8 +15,10 @@ body:
description: Which area(s) does your bug report concern? If none fits, please select `area:other`
multiple: true
options:
- docs
- tooling
- schema
- area:other
- area:docs
# NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
# DO NOT manually edit it.
# Start semconv area list
Expand Down Expand Up @@ -90,27 +92,12 @@ body:
# End semconv area list
- type: textarea
attributes:
label: What happened?
description: Please provide as much detail as you reasonably can.
value: |
## Description
## Steps to Reproduce (if any)
## Expected Result
## Actual Result
validations:
required: true

- type: input
attributes:
label: Semantic convention version
description: What version did you use? (e.g., `v1.24.0`, `1eb551b`, etc)
label: What's the problem?
description: Please describe the problem as precisely as you reasonably can.
validations:
required: true

- type: textarea
attributes:
label: Additional context
description: Any additional information you think may be relevant to this issue.
label: Describe the solution you'd like
description: A clear and concise description of solution you'd like to see.
24 changes: 8 additions & 16 deletions .github/ISSUE_TEMPLATE/change_proposal.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: Propose changes to existing conventions
description: Propose changes you'd like to be added to existing conventions
labels: ["enhancement", "triage:needs-triage"]
name: Propose enhancement to existing conventions
description: Propose changes you'd like to see
body:
- type: dropdown
id: area
Expand All @@ -9,6 +8,9 @@ body:
description: Which area(s) does your change request concern?
multiple: true
options:
- docs
- tooling
- schema
# NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
# DO NOT manually edit it.
# Start semconv area list
Expand Down Expand Up @@ -82,21 +84,11 @@ body:
# End semconv area list
- type: textarea
attributes:
label: Is your change request related to a problem? Please describe.
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
label: What's missing?
description: Please describe the use-case or scenario that is not covered by the existing conventions.
validations:
required: true
- type: textarea
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
- type: textarea
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
description: A clear and concise description of solution you'd like to see.
116 changes: 16 additions & 100 deletions .github/ISSUE_TEMPLATE/new-conventions.yaml
Original file line number Diff line number Diff line change
@@ -1,111 +1,27 @@
name: Propose new semantic conventions
description: Propose new conventions you'd like to be part of the OpenTelemetry project
labels: ["enhancement", "triage:needs-triage", "experts needed"]
description: Propose new conventions you'd like to see in the OpenTelemetry project
labels: ["enhancement", "experts needed"]
body:
- type: markdown
attributes:
value: |
Please make sure to fill out the entire form below, providing as much context as you can in order to help us triage the proposal as quickly as possible.
Thanks for your interest in contributing to the OpenTelemetry Semantic Conventions!
Before filing the proposal, please be sure you have searched through [existing issues](https://github.com/open-telemetry/semantic-conventions/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Aenhancement+label%3Aarea:new) to see if an existing issue covers your proposal.
Substantial changes to the conventions follow [OTel project management]
(https://github.com/open-telemetry/community/blob/main/project-management.md) process
and usually require a group of people who are familiar with the domain,
are involved with instrumentation efforts, and are committed to be the point of contact for
pull requests, issues, and questions in this area.
Additionally, make sure to read and follow the guidelines on [Project Proposal](https://github.com/open-telemetry/community/blob/main/project-management.md#project-management), in case the proposal is for a new set of conventions/working group.
- type: dropdown
id: area
attributes:
label: Area(s)
description: Which area(s) does your new conventions concern? If none fits, please select `area:new`
multiple: true
options:
- area:new
# NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
# DO NOT manually edit it.
# Start semconv area list
- area:android
- area:artifact
- area:aspnetcore
- area:aws
- area:azure
- area:browser
- area:cicd
- area:client
- area:cloud
- area:cloudevents
- area:cloudfoundry
- area:code
- area:container
- area:cpu
- area:db
- area:deployment
- area:destination
- area:device
- area:disk
- area:dns
- area:dotnet
- area:error
- area:exception
- area:faas
- area:feature-flag
- area:file
- area:gcp
- area:gen-ai
- area:geo
- area:go
- area:graphql
- area:hardware
- area:heroku
- area:host
- area:http
- area:jvm
- area:k8s
- area:linux
- area:log
- area:messaging
- area:network
- area:nodejs
- area:oci
- area:opentracing
- area:os
- area:otel
- area:peer
- area:process
- area:profile
- area:rpc
- area:security-rule
- area:server
- area:service
- area:session
- area:signalr
- area:source
- area:system
- area:telemetry
- area:test
- area:thread
- area:tls
- area:url
- area:user
- area:user-agent
- area:v8js
- area:vcs
- area:webengine
# End semconv area list
- type: textarea
attributes:
label: Is your change request related to a problem? Please describe.
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
validations:
required: true
Creating a new issue here is a great first step to find others interested in collaborating.
- type: textarea
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
label: Propose new conventions
description: |
Please provide a brief description of the conventions, including
telemetry signals you'd like to define.
Consider specifying which instrumentations or systems would implement these
conventions and the benefits they would bring to the ecosystem.
validations:
required: true
- type: textarea
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
- type: textarea
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
3 changes: 0 additions & 3 deletions .github/workflows/prepare-new-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Run update permissions
run: chmod +x ./.github/workflows/scripts/prepare-new-issue.sh

- name: Run prepare-new-issue.sh
run: ./.github/workflows/scripts/prepare-new-issue.sh
env:
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/prepare-new-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: 'Prepare new PR'
on:
pull_request_target:
types: [opened, synchronize]
branches: [ 'main*' ]
paths: ['.chloggen/*']

jobs:
prepare-new-pr:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
if: ${{ github.repository_owner == 'open-telemetry' }}
steps:
# check out main
- uses: actions/checkout@v4
# sparse checkout to only get the .chloggen directory
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
path: prchangelog
repository: ${{ github.event.pull_request.head.repo.full_name }}
sparse-checkout: .chloggen

# we're going to run prepare-new-pr script from the main branch
# to parse changelog record from the PR branch.
- name: Run prepare-new-pr.sh
run: ./.github/workflows/scripts/prepare-new-pr.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR: ${{ github.event.pull_request.number }}
PR_CHANGELOG_PATH: prchangelog
Loading

0 comments on commit e3b73a1

Please sign in to comment.