Skip to content

Commit 1bf9d14

Browse files
committed
generate semconv 1.30
NB that v1.29 contained a bug, and the recommendation was to skip this version
1 parent 96ce422 commit 1bf9d14

File tree

6 files changed

+68
-7
lines changed

6 files changed

+68
-7
lines changed

script/semantic-conventions/semconv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ 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.28.0
20+
SEMCONV_VERSION=1.30.0
2121
SPEC_VERSION=v$SEMCONV_VERSION
2222
SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
2323
OTEL_WEAVER_IMG_VERSION=v0.12.0

src/SemConv/ResourceAttributeValues.php

Lines changed: 1 addition & 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.28.0';
14+
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.30.0';
1515

1616
/**
1717
* ec2

src/SemConv/ResourceAttributes.php

Lines changed: 31 additions & 1 deletion
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.28.0';
14+
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.30.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).
@@ -638,6 +638,16 @@ interface ResourceAttributes
638638
*/
639639
public const K8S_DEPLOYMENT_UID = 'k8s.deployment.uid';
640640

641+
/**
642+
* The name of the horizontal pod autoscaler.
643+
*/
644+
public const K8S_HPA_NAME = 'k8s.hpa.name';
645+
646+
/**
647+
* The UID of the horizontal pod autoscaler.
648+
*/
649+
public const K8S_HPA_UID = 'k8s.hpa.uid';
650+
641651
/**
642652
* The name of the Job.
643653
*/
@@ -693,6 +703,26 @@ interface ResourceAttributes
693703
*/
694704
public const K8S_REPLICASET_UID = 'k8s.replicaset.uid';
695705

706+
/**
707+
* The name of the replication controller.
708+
*/
709+
public const K8S_REPLICATIONCONTROLLER_NAME = 'k8s.replicationcontroller.name';
710+
711+
/**
712+
* The UID of the replication controller.
713+
*/
714+
public const K8S_REPLICATIONCONTROLLER_UID = 'k8s.replicationcontroller.uid';
715+
716+
/**
717+
* The name of the resource quota.
718+
*/
719+
public const K8S_RESOURCEQUOTA_NAME = 'k8s.resourcequota.name';
720+
721+
/**
722+
* The UID of the resource quota.
723+
*/
724+
public const K8S_RESOURCEQUOTA_UID = 'k8s.resourcequota.uid';
725+
696726
/**
697727
* The name of the StatefulSet.
698728
*/

src/SemConv/TraceAttributeValues.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interface TraceAttributeValues
1111
/**
1212
* The URL of the OpenTelemetry schema for these values.
1313
*/
14-
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.28.0';
14+
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.30.0';
1515
/**
1616
* Any time before Activity.onResume() or, if the app has no Activity, Context.startService() has been called in the app for the first time.
1717
*

src/SemConv/TraceAttributes.php

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interface TraceAttributes
1111
/**
1212
* The URL of the OpenTelemetry schema for these keys and values.
1313
*/
14-
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.28.0';
14+
public const SCHEMA_URL = 'https://opentelemetry.io/schemas/1.30.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).
@@ -1044,14 +1044,14 @@ interface TraceAttributes
10441044
* Low cardinality representation of a database query text.
10451045
*
10461046
* `db.query.summary` provides static summary of the query text. It describes a class of database queries and is useful as a grouping key, especially when analyzing telemetry for database calls involving complex queries.
1047-
* Summary may be available to the instrumentation through instrumentation hooks or other means. If it is not available, instrumentations that support query parsing SHOULD generate a summary following [Generating query summary](../../docs/database/database-spans.md#generating-a-summary-of-the-query-text) section.
1047+
* Summary may be available to the instrumentation through instrumentation hooks or other means. If it is not available, instrumentations that support query parsing SHOULD generate a summary following [Generating query summary](../database/database-spans.md#generating-a-summary-of-the-query-text) section.
10481048
*/
10491049
public const DB_QUERY_SUMMARY = 'db.query.summary';
10501050

10511051
/**
10521052
* The database query being executed.
10531053
*
1054-
* For sanitization see [Sanitization of `db.query.text`](../../docs/database/database-spans.md#sanitization-of-dbquerytext).
1054+
* For sanitization see [Sanitization of `db.query.text`](../database/database-spans.md#sanitization-of-dbquerytext).
10551055
* For batch operations, if the individual operations are known to have the same query text then that query text SHOULD be used, otherwise all of the individual query texts SHOULD be concatenated with separator `; ` or some other database system specific separator if more applicable.
10561056
* Even though parameterized query text can potentially have sensitive data, by using a parameterized query the user is giving a strong signal that any sensitive data will be passed as parameter values, and the benefit to observability of capturing the static part of the query text by default outweighs the risk.
10571057
*/
@@ -2188,6 +2188,16 @@ interface TraceAttributes
21882188
*/
21892189
public const K8S_DEPLOYMENT_UID = 'k8s.deployment.uid';
21902190

2191+
/**
2192+
* The name of the horizontal pod autoscaler.
2193+
*/
2194+
public const K8S_HPA_NAME = 'k8s.hpa.name';
2195+
2196+
/**
2197+
* The UID of the horizontal pod autoscaler.
2198+
*/
2199+
public const K8S_HPA_UID = 'k8s.hpa.uid';
2200+
21912201
/**
21922202
* The name of the Job.
21932203
*/
@@ -2258,6 +2268,26 @@ interface TraceAttributes
22582268
*/
22592269
public const K8S_REPLICASET_UID = 'k8s.replicaset.uid';
22602270

2271+
/**
2272+
* The name of the replication controller.
2273+
*/
2274+
public const K8S_REPLICATIONCONTROLLER_NAME = 'k8s.replicationcontroller.name';
2275+
2276+
/**
2277+
* The UID of the replication controller.
2278+
*/
2279+
public const K8S_REPLICATIONCONTROLLER_UID = 'k8s.replicationcontroller.uid';
2280+
2281+
/**
2282+
* The name of the resource quota.
2283+
*/
2284+
public const K8S_RESOURCEQUOTA_NAME = 'k8s.resourcequota.name';
2285+
2286+
/**
2287+
* The UID of the resource quota.
2288+
*/
2289+
public const K8S_RESOURCEQUOTA_UID = 'k8s.resourcequota.uid';
2290+
22612291
/**
22622292
* The name of the StatefulSet.
22632293
*/

src/SemConv/Version.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
enum Version: string
88
{
9+
case VERSION_1_30_0 = '1.30.0';
910
case VERSION_1_28_0 = '1.28.0';
1011
case VERSION_1_27_0 = '1.27.0';
1112
case VERSION_1_26_0 = '1.26.0';

0 commit comments

Comments
 (0)