Skip to content

Commit 4e88878

Browse files
authored
Update to semconv 1.37.0 (#288)
1 parent 237f63d commit 4e88878

20 files changed

+445
-85
lines changed

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ val snapshot = true
1111
// end
1212

1313
// The release version of https://github.com/open-telemetry/semantic-conventions used to generate classes
14-
var semanticConventionsVersion = "1.36.0"
14+
var semanticConventionsVersion = "1.37.0"
1515
val schemaUrlVersions = listOf(
1616
semanticConventionsVersion,
17+
"1.36.0",
1718
"1.35.0",
1819
"1.34.0",
1920
"1.33.0",
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
Comparing source compatibility of opentelemetry-semconv-1.36.0-SNAPSHOT.jar against opentelemetry-semconv-1.36.0.jar
2-
No changes.
1+
Comparing source compatibility of opentelemetry-semconv-1.37.0-SNAPSHOT.jar against opentelemetry-semconv-1.36.0.jar
2+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.semconv.SchemaUrls (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_37_0

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AndroidIncubatingAttributes.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@ public final class AndroidIncubatingAttributes {
2626

2727
/**
2828
* Uniquely identifies the framework API revision offered by a version ({@code os.version}) of the
29-
* android operating system. More information can be found <a
30-
* href="https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels">here</a>.
29+
* android operating system. More information can be found in the <a
30+
* href="https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels">Android
31+
* API levels documentation</a>.
3132
*/
3233
public static final AttributeKey<String> ANDROID_OS_API_LEVEL = stringKey("android.os.api_level");
3334

3435
/**
35-
* Deprecated. Use {@code android.app.state} body field instead.
36+
* Deprecated. Use {@code android.app.state} attribute instead.
3637
*
37-
* @deprecated Use {@code android.app.state} body field instead.
38+
* @deprecated Replaced by {@code android.app.state}.
3839
*/
3940
@Deprecated public static final AttributeKey<String> ANDROID_STATE = stringKey("android.state");
4041

@@ -66,7 +67,7 @@ private AndroidAppStateIncubatingValues() {}
6667
/**
6768
* Values for {@link #ANDROID_STATE}
6869
*
69-
* @deprecated Use {@code android.app.state} body field instead.
70+
* @deprecated Replaced by {@code android.app.state}.
7071
*/
7172
@Deprecated
7273
public static final class AndroidStateIncubatingValues {

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AppIncubatingAttributes.java

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.semconv.incubating;
77

8+
import static io.opentelemetry.api.common.AttributeKey.doubleKey;
89
import static io.opentelemetry.api.common.AttributeKey.longKey;
910
import static io.opentelemetry.api.common.AttributeKey.stringKey;
1011

@@ -14,6 +15,9 @@
1415
// buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2
1516
@SuppressWarnings("unused")
1617
public final class AppIncubatingAttributes {
18+
/** Unique identifier for a particular build or compilation of the application. */
19+
public static final AttributeKey<String> APP_BUILD_ID = stringKey("app.build_id");
20+
1721
/**
1822
* A unique identifier representing the installation of an application on a specific device
1923
*
@@ -44,11 +48,27 @@ public final class AppIncubatingAttributes {
4448
* Settings.getString(Settings.Secure.ANDROID_ID)}</a>.
4549
* </ul>
4650
*
47-
* <p>More information about Android identifier best practices can be found <a
48-
* href="https://developer.android.com/training/articles/user-data-ids">here</a>.
51+
* <p>More information about Android identifier best practices can be found in the <a
52+
* href="https://developer.android.com/training/articles/user-data-ids">Android user data IDs
53+
* guide</a>.
4954
*/
5055
public static final AttributeKey<String> APP_INSTALLATION_ID = stringKey("app.installation.id");
5156

57+
/**
58+
* A number of frame renders that experienced jank.
59+
*
60+
* <p>Notes:
61+
*
62+
* <p>Depending on platform limitations, the value provided MAY be approximation.
63+
*/
64+
public static final AttributeKey<Long> APP_JANK_FRAME_COUNT = longKey("app.jank.frame_count");
65+
66+
/** The time period, in seconds, for which this jank is being reported. */
67+
public static final AttributeKey<Double> APP_JANK_PERIOD = doubleKey("app.jank.period");
68+
69+
/** The minimum rendering threshold for this jank, in seconds. */
70+
public static final AttributeKey<Double> APP_JANK_THRESHOLD = doubleKey("app.jank.threshold");
71+
5272
/** The x (horizontal) coordinate of a screen coordinate, in screen pixels. */
5373
public static final AttributeKey<Long> APP_SCREEN_COORDINATE_X =
5474
longKey("app.screen.coordinate.x");

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AwsIncubatingAttributes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,10 +409,10 @@ public final class AwsIncubatingAttributes {
409409

410410
/** Values for {@link #AWS_ECS_LAUNCHTYPE}. */
411411
public static final class AwsEcsLaunchtypeIncubatingValues {
412-
/** ec2. */
412+
/** Amazon EC2 */
413413
public static final String EC2 = "ec2";
414414

415-
/** fargate. */
415+
/** Amazon Fargate */
416416
public static final String FARGATE = "fargate";
417417

418418
private AwsEcsLaunchtypeIncubatingValues() {}

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AzureIncubatingAttributes.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,19 @@ private AzureCosmosdbConnectionModeIncubatingValues() {}
8787

8888
/** Values for {@link #AZURE_COSMOSDB_CONSISTENCY_LEVEL}. */
8989
public static final class AzureCosmosdbConsistencyLevelIncubatingValues {
90-
/** strong. */
90+
/** Strong */
9191
public static final String STRONG = "Strong";
9292

93-
/** bounded_staleness. */
93+
/** Bounded Staleness */
9494
public static final String BOUNDED_STALENESS = "BoundedStaleness";
9595

96-
/** session. */
96+
/** Session */
9797
public static final String SESSION = "Session";
9898

99-
/** eventual. */
99+
/** Eventual */
100100
public static final String EVENTUAL = "Eventual";
101101

102-
/** consistent_prefix. */
102+
/** Consistent Prefix */
103103
public static final String CONSISTENT_PREFIX = "ConsistentPrefix";
104104

105105
private AzureCosmosdbConsistencyLevelIncubatingValues() {}

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CassandraIncubatingAttributes.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,37 +48,37 @@ public final class CassandraIncubatingAttributes {
4848

4949
/** Values for {@link #CASSANDRA_CONSISTENCY_LEVEL}. */
5050
public static final class CassandraConsistencyLevelIncubatingValues {
51-
/** all. */
51+
/** All */
5252
public static final String ALL = "all";
5353

54-
/** each_quorum. */
54+
/** Each Quorum */
5555
public static final String EACH_QUORUM = "each_quorum";
5656

57-
/** quorum. */
57+
/** Quorum */
5858
public static final String QUORUM = "quorum";
5959

60-
/** local_quorum. */
60+
/** Local Quorum */
6161
public static final String LOCAL_QUORUM = "local_quorum";
6262

63-
/** one. */
63+
/** One */
6464
public static final String ONE = "one";
6565

66-
/** two. */
66+
/** Two */
6767
public static final String TWO = "two";
6868

69-
/** three. */
69+
/** Three */
7070
public static final String THREE = "three";
7171

72-
/** local_one. */
72+
/** Local One */
7373
public static final String LOCAL_ONE = "local_one";
7474

75-
/** any. */
75+
/** Any */
7676
public static final String ANY = "any";
7777

78-
/** serial. */
78+
/** Serial */
7979
public static final String SERIAL = "serial";
8080

81-
/** local_serial. */
81+
/** Local Serial */
8282
public static final String LOCAL_SERIAL = "local_serial";
8383

8484
private CassandraConsistencyLevelIncubatingValues() {}

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/ContainerIncubatingAttributes.java

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,31 @@ public final class ContainerIncubatingAttributes {
141141
/** Container name used by container runtime. */
142142
public static final AttributeKey<String> CONTAINER_NAME = stringKey("container.name");
143143

144-
/** The container runtime managing this container. */
144+
/**
145+
* The container runtime managing this container.
146+
*
147+
* @deprecated Replaced by {@code container.runtime.name}.
148+
*/
149+
@Deprecated
145150
public static final AttributeKey<String> CONTAINER_RUNTIME = stringKey("container.runtime");
146151

152+
/**
153+
* A description about the runtime which could include, for example details about the CRI/API
154+
* version being used or other customisations.
155+
*/
156+
public static final AttributeKey<String> CONTAINER_RUNTIME_DESCRIPTION =
157+
stringKey("container.runtime.description");
158+
159+
/** The container runtime managing this container. */
160+
public static final AttributeKey<String> CONTAINER_RUNTIME_NAME =
161+
stringKey("container.runtime.name");
162+
163+
/**
164+
* The version of the runtime of this process, as returned by the runtime without modification.
165+
*/
166+
public static final AttributeKey<String> CONTAINER_RUNTIME_VERSION =
167+
stringKey("container.runtime.version");
168+
147169
// Enum definitions
148170

149171
/**

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CpuIncubatingAttributes.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@ public final class CpuIncubatingAttributes {
2424

2525
/** Values for {@link #CPU_MODE}. */
2626
public static final class CpuModeIncubatingValues {
27-
/** user. */
27+
/** User */
2828
public static final String USER = "user";
2929

30-
/** system. */
30+
/** System */
3131
public static final String SYSTEM = "system";
3232

33-
/** nice. */
33+
/** Nice */
3434
public static final String NICE = "nice";
3535

36-
/** idle. */
36+
/** Idle */
3737
public static final String IDLE = "idle";
3838

39-
/** iowait. */
39+
/** IO Wait */
4040
public static final String IOWAIT = "iowait";
4141

42-
/** interrupt. */
42+
/** Interrupt */
4343
public static final String INTERRUPT = "interrupt";
4444

45-
/** steal. */
45+
/** Steal */
4646
public static final String STEAL = "steal";
4747

48-
/** kernel. */
48+
/** Kernel */
4949
public static final String KERNEL = "kernel";
5050

5151
private CpuModeIncubatingValues() {}

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DbIncubatingAttributes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ public static final class DbSystemIncubatingValues {
750750
/**
751751
* Deprecated, no replacement at this time.
752752
*
753-
* @deprecated Removed.
753+
* @deprecated Obsoleted.
754754
*/
755755
@Deprecated public static final String COLDFUSION = "coldfusion";
756756

@@ -842,7 +842,7 @@ public static final class DbSystemIncubatingValues {
842842
/**
843843
* Deprecated, Microsoft SQL Server Compact is discontinued.
844844
*
845-
* @deprecated Removed, use {@code other_sql} instead.
845+
* @deprecated Replaced by {@code other_sql}.
846846
*/
847847
@Deprecated public static final String MSSQLCOMPACT = "mssqlcompact";
848848

0 commit comments

Comments
 (0)