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.

Sign up for GitHub

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

generate semconv 1.28 #1491

Merged
merged 2 commits into from
Jan 29, 2025
Merged

generate semconv 1.28 #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
355f2be
generate semconv 1.28
brettmc Jan 28, 2025
ebea409
update version.php for 1.28
brettmc Jan 29, 2025
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
4 changes: 2 additions & 2 deletions script/semantic-conventions/semconv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ SPEC_DIR="${ROOT_DIR}/var/semantic-conventions"
CODE_DIR="${ROOT_DIR}/src/SemConv"

# freeze the spec & generator tools versions to make SemanticAttributes generation reproducible
SEMCONV_VERSION=1.27.0
SEMCONV_VERSION=1.28.0
SPEC_VERSION=v$SEMCONV_VERSION
SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
OTEL_WEAVER_IMG_VERSION=v0.10.0
OTEL_WEAVER_IMG_VERSION=v0.12.0

rm -rf "${SPEC_DIR}"
mkdir "${SPEC_DIR}"
Expand Down
23 changes: 22 additions & 1 deletion src/SemConv/ResourceAttributeValues.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface ResourceAttributeValues
/**
* The URL of the OpenTelemetry schema for these values.
*/
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.27.0';
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.28.0';

/**
* ec2
Expand Down Expand Up @@ -202,6 +202,20 @@ interface ResourceAttributeValues
*/
public const CLOUD_PLATFORM_IBM_CLOUD_OPENSHIFT = 'ibm_cloud_openshift';

/**
* Compute on Oracle Cloud Infrastructure (OCI)
*
* @see ResourceAttributes::CLOUD_PLATFORM
*/
public const CLOUD_PLATFORM_ORACLE_CLOUD_COMPUTE = 'oracle_cloud_compute';

/**
* Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI)
*
* @see ResourceAttributes::CLOUD_PLATFORM
*/
public const CLOUD_PLATFORM_ORACLE_CLOUD_OKE = 'oracle_cloud_oke';

/**
* Tencent Cloud Cloud Virtual Machine (CVM)
*
Expand Down Expand Up @@ -265,6 +279,13 @@ interface ResourceAttributeValues
*/
public const CLOUD_PROVIDER_IBM_CLOUD = 'ibm_cloud';

/**
* Oracle Cloud Infrastructure (OCI)
*
* @see ResourceAttributes::CLOUD_PROVIDER
*/
public const CLOUD_PROVIDER_ORACLE_CLOUD = 'oracle_cloud';

/**
* Tencent Cloud
*
Expand Down
12 changes: 9 additions & 3 deletions src/SemConv/ResourceAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface ResourceAttributes
/**
* The URL of the OpenTelemetry schema for these keys and values.
*/
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.27.0';
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.28.0';

/**
* Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels).
Expand Down Expand Up @@ -388,7 +388,7 @@ interface ResourceAttributes
* This is the name of the function as configured/deployed on the FaaS
* platform and is usually different from the name of the callback
* function (which may be stored in the
* [`code.namespace`/`code.function`](/docs/general/attributes.md#source-code-attributes)
* [`code.namespace`/`code.function.name`](/docs/general/attributes.md#source-code-attributes)
* span attributes).
*
* For some cloud providers, the above definition is ambiguous. The following
Expand Down Expand Up @@ -778,6 +778,12 @@ interface ResourceAttributes
*/
public const PROCESS_EXECUTABLE_PATH = 'process.executable.path';

/**
* The control group associated with the process.
* Control groups (cgroups) are a kernel feature used to organize and manage process resources. This attribute provides the path(s) to the cgroup(s) associated with the process, which should match the contents of the [/proc/[PID]/cgroup](https://man7.org/linux/man-pages/man7/cgroups.7.html) file.
*/
public const PROCESS_LINUX_CGROUP = 'process.linux.cgroup';

/**
* The username of the user that owns the process.
*/
Expand Down Expand Up @@ -823,7 +829,7 @@ interface ResourceAttributes
*
* UUIDs are typically recommended, as only an opaque value for the purposes of identifying a service instance is
* needed. Similar to what can be seen in the man page for the
* [`/etc/machine-id`](https://www.freedesktop.org/software/systemd/man/machine-id.html) file, the underlying
* [`/etc/machine-id`](https://www.freedesktop.org/software/systemd/man/latest/machine-id.html) file, the underlying
* data, such as pod name and namespace should be treated as confidential, being the user's choice to expose it
* or not via another resource attribute.
*
Expand Down
Loading
Loading