Skip to content

Commit 355f2be

Browse files
committed
generate semconv 1.28
1 parent 7eb3abb commit 355f2be

File tree

5 files changed

+1567
-120
lines changed

5 files changed

+1567
-120
lines changed

script/semantic-conventions/semconv.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ SPEC_DIR="${ROOT_DIR}/var/semantic-conventions"
1717
CODE_DIR="${ROOT_DIR}/src/SemConv"
1818

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

2525
rm -rf "${SPEC_DIR}"
2626
mkdir "${SPEC_DIR}"

src/SemConv/ResourceAttributeValues.php

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interface ResourceAttributeValues
1111
/**
1212
* The URL of the OpenTelemetry schema for these values.
1313
*/
14-
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.27.0';
14+
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.28.0';
1515

1616
/**
1717
* ec2
@@ -202,6 +202,20 @@ interface ResourceAttributeValues
202202
*/
203203
public const CLOUD_PLATFORM_IBM_CLOUD_OPENSHIFT = 'ibm_cloud_openshift';
204204

205+
/**
206+
* Compute on Oracle Cloud Infrastructure (OCI)
207+
*
208+
* @see ResourceAttributes::CLOUD_PLATFORM
209+
*/
210+
public const CLOUD_PLATFORM_ORACLE_CLOUD_COMPUTE = 'oracle_cloud_compute';
211+
212+
/**
213+
* Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI)
214+
*
215+
* @see ResourceAttributes::CLOUD_PLATFORM
216+
*/
217+
public const CLOUD_PLATFORM_ORACLE_CLOUD_OKE = 'oracle_cloud_oke';
218+
205219
/**
206220
* Tencent Cloud Cloud Virtual Machine (CVM)
207221
*
@@ -265,6 +279,13 @@ interface ResourceAttributeValues
265279
*/
266280
public const CLOUD_PROVIDER_IBM_CLOUD = 'ibm_cloud';
267281

282+
/**
283+
* Oracle Cloud Infrastructure (OCI)
284+
*
285+
* @see ResourceAttributes::CLOUD_PROVIDER
286+
*/
287+
public const CLOUD_PROVIDER_ORACLE_CLOUD = 'oracle_cloud';
288+
268289
/**
269290
* Tencent Cloud
270291
*

src/SemConv/ResourceAttributes.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interface ResourceAttributes
1111
/**
1212
* The URL of the OpenTelemetry schema for these keys and values.
1313
*/
14-
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.27.0';
14+
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.28.0';
1515

1616
/**
1717
* 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).
@@ -388,7 +388,7 @@ interface ResourceAttributes
388388
* This is the name of the function as configured/deployed on the FaaS
389389
* platform and is usually different from the name of the callback
390390
* function (which may be stored in the
391-
* [`code.namespace`/`code.function`](/docs/general/attributes.md#source-code-attributes)
391+
* [`code.namespace`/`code.function.name`](/docs/general/attributes.md#source-code-attributes)
392392
* span attributes).
393393
*
394394
* For some cloud providers, the above definition is ambiguous. The following
@@ -778,6 +778,12 @@ interface ResourceAttributes
778778
*/
779779
public const PROCESS_EXECUTABLE_PATH = 'process.executable.path';
780780

781+
/**
782+
* The control group associated with the process.
783+
* 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.
784+
*/
785+
public const PROCESS_LINUX_CGROUP = 'process.linux.cgroup';
786+
781787
/**
782788
* The username of the user that owns the process.
783789
*/
@@ -823,7 +829,7 @@ interface ResourceAttributes
823829
*
824830
* UUIDs are typically recommended, as only an opaque value for the purposes of identifying a service instance is
825831
* needed. Similar to what can be seen in the man page for the
826-
* [`/etc/machine-id`](https://www.freedesktop.org/software/systemd/man/machine-id.html) file, the underlying
832+
* [`/etc/machine-id`](https://www.freedesktop.org/software/systemd/man/latest/machine-id.html) file, the underlying
827833
* data, such as pod name and namespace should be treated as confidential, being the user's choice to expose it
828834
* or not via another resource attribute.
829835
*

0 commit comments

Comments
 (0)