Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ val snapshot = true
// end

// The release version of https://github.com/open-telemetry/semantic-conventions used to generate classes
var semanticConventionsVersion = "1.36.0"
var semanticConventionsVersion = "1.37.0"
val schemaUrlVersions = listOf(
semanticConventionsVersion,
"1.36.0",
"1.35.0",
"1.34.0",
"1.33.0",
Expand Down
6 changes: 4 additions & 2 deletions docs/apidiffs/current_vs_latest/opentelemetry-semconv.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
Comparing source compatibility of opentelemetry-semconv-1.36.0-SNAPSHOT.jar against opentelemetry-semconv-1.36.0.jar
No changes.
Comparing source compatibility of opentelemetry-semconv-1.37.0-SNAPSHOT.jar against opentelemetry-semconv-1.36.0.jar
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.semconv.SchemaUrls (not serializable)
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String V1_37_0
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,16 @@ public final class AndroidIncubatingAttributes {

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

/**
* Deprecated. Use {@code android.app.state} body field instead.
* Deprecated. Use {@code android.app.state} attribute instead.
*
* @deprecated Use {@code android.app.state} body field instead.
* @deprecated Replaced by {@code android.app.state}.
*/
@Deprecated public static final AttributeKey<String> ANDROID_STATE = stringKey("android.state");

Expand Down Expand Up @@ -66,7 +67,7 @@ private AndroidAppStateIncubatingValues() {}
/**
* Values for {@link #ANDROID_STATE}
*
* @deprecated Use {@code android.app.state} body field instead.
* @deprecated Replaced by {@code android.app.state}.
*/
@Deprecated
public static final class AndroidStateIncubatingValues {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package io.opentelemetry.semconv.incubating;

import static io.opentelemetry.api.common.AttributeKey.doubleKey;
import static io.opentelemetry.api.common.AttributeKey.longKey;
import static io.opentelemetry.api.common.AttributeKey.stringKey;

Expand All @@ -14,6 +15,9 @@
// buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2
@SuppressWarnings("unused")
public final class AppIncubatingAttributes {
/** Unique identifier for a particular build or compilation of the application. */
public static final AttributeKey<String> APP_BUILD_ID = stringKey("app.build_id");

/**
* A unique identifier representing the installation of an application on a specific device
*
Expand Down Expand Up @@ -44,11 +48,27 @@ public final class AppIncubatingAttributes {
* Settings.getString(Settings.Secure.ANDROID_ID)}</a>.
* </ul>
*
* <p>More information about Android identifier best practices can be found <a
* href="https://developer.android.com/training/articles/user-data-ids">here</a>.
* <p>More information about Android identifier best practices can be found in the <a
* href="https://developer.android.com/training/articles/user-data-ids">Android user data IDs
* guide</a>.
*/
public static final AttributeKey<String> APP_INSTALLATION_ID = stringKey("app.installation.id");

/**
* A number of frame renders that experienced jank.
*
* <p>Notes:
*
* <p>Depending on platform limitations, the value provided MAY be approximation.
*/
public static final AttributeKey<Long> APP_JANK_FRAME_COUNT = longKey("app.jank.frame_count");

/** The time period, in seconds, for which this jank is being reported. */
public static final AttributeKey<Double> APP_JANK_PERIOD = doubleKey("app.jank.period");

/** The minimum rendering threshold for this jank, in seconds. */
public static final AttributeKey<Double> APP_JANK_THRESHOLD = doubleKey("app.jank.threshold");

/** The x (horizontal) coordinate of a screen coordinate, in screen pixels. */
public static final AttributeKey<Long> APP_SCREEN_COORDINATE_X =
longKey("app.screen.coordinate.x");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,10 @@ public final class AwsIncubatingAttributes {

/** Values for {@link #AWS_ECS_LAUNCHTYPE}. */
public static final class AwsEcsLaunchtypeIncubatingValues {
/** ec2. */
/** Amazon EC2 */
public static final String EC2 = "ec2";

/** fargate. */
/** Amazon Fargate */
public static final String FARGATE = "fargate";

private AwsEcsLaunchtypeIncubatingValues() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,19 @@ private AzureCosmosdbConnectionModeIncubatingValues() {}

/** Values for {@link #AZURE_COSMOSDB_CONSISTENCY_LEVEL}. */
public static final class AzureCosmosdbConsistencyLevelIncubatingValues {
/** strong. */
/** Strong */
public static final String STRONG = "Strong";

/** bounded_staleness. */
/** Bounded Staleness */
public static final String BOUNDED_STALENESS = "BoundedStaleness";

/** session. */
/** Session */
public static final String SESSION = "Session";

/** eventual. */
/** Eventual */
public static final String EVENTUAL = "Eventual";

/** consistent_prefix. */
/** Consistent Prefix */
public static final String CONSISTENT_PREFIX = "ConsistentPrefix";

private AzureCosmosdbConsistencyLevelIncubatingValues() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,37 +48,37 @@ public final class CassandraIncubatingAttributes {

/** Values for {@link #CASSANDRA_CONSISTENCY_LEVEL}. */
public static final class CassandraConsistencyLevelIncubatingValues {
/** all. */
/** All */
public static final String ALL = "all";

/** each_quorum. */
/** Each Quorum */
public static final String EACH_QUORUM = "each_quorum";

/** quorum. */
/** Quorum */
public static final String QUORUM = "quorum";

/** local_quorum. */
/** Local Quorum */
public static final String LOCAL_QUORUM = "local_quorum";

/** one. */
/** One */
public static final String ONE = "one";

/** two. */
/** Two */
public static final String TWO = "two";

/** three. */
/** Three */
public static final String THREE = "three";

/** local_one. */
/** Local One */
public static final String LOCAL_ONE = "local_one";

/** any. */
/** Any */
public static final String ANY = "any";

/** serial. */
/** Serial */
public static final String SERIAL = "serial";

/** local_serial. */
/** Local Serial */
public static final String LOCAL_SERIAL = "local_serial";

private CassandraConsistencyLevelIncubatingValues() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,31 @@ public final class ContainerIncubatingAttributes {
/** Container name used by container runtime. */
public static final AttributeKey<String> CONTAINER_NAME = stringKey("container.name");

/** The container runtime managing this container. */
/**
* The container runtime managing this container.
*
* @deprecated Replaced by {@code container.runtime.name}.
*/
@Deprecated
public static final AttributeKey<String> CONTAINER_RUNTIME = stringKey("container.runtime");

/**
* A description about the runtime which could include, for example details about the CRI/API
* version being used or other customisations.
*/
public static final AttributeKey<String> CONTAINER_RUNTIME_DESCRIPTION =
stringKey("container.runtime.description");

/** The container runtime managing this container. */
public static final AttributeKey<String> CONTAINER_RUNTIME_NAME =
stringKey("container.runtime.name");

/**
* The version of the runtime of this process, as returned by the runtime without modification.
*/
public static final AttributeKey<String> CONTAINER_RUNTIME_VERSION =
stringKey("container.runtime.version");

// Enum definitions

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,28 @@ public final class CpuIncubatingAttributes {

/** Values for {@link #CPU_MODE}. */
public static final class CpuModeIncubatingValues {
/** user. */
/** User */
public static final String USER = "user";

/** system. */
/** System */
public static final String SYSTEM = "system";

/** nice. */
/** Nice */
public static final String NICE = "nice";

/** idle. */
/** Idle */
public static final String IDLE = "idle";

/** iowait. */
/** IO Wait */
public static final String IOWAIT = "iowait";

/** interrupt. */
/** Interrupt */
public static final String INTERRUPT = "interrupt";

/** steal. */
/** Steal */
public static final String STEAL = "steal";

/** kernel. */
/** Kernel */
public static final String KERNEL = "kernel";

private CpuModeIncubatingValues() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ public static final class DbSystemIncubatingValues {
/**
* Deprecated, no replacement at this time.
*
* @deprecated Removed.
* @deprecated Obsoleted.
*/
@Deprecated public static final String COLDFUSION = "coldfusion";

Expand Down Expand Up @@ -842,7 +842,7 @@ public static final class DbSystemIncubatingValues {
/**
* Deprecated, Microsoft SQL Server Compact is discontinued.
*
* @deprecated Removed, use {@code other_sql} instead.
* @deprecated Replaced by {@code other_sql}.
*/
@Deprecated public static final String MSSQLCOMPACT = "mssqlcompact";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@SuppressWarnings("unused")
public final class DeploymentIncubatingAttributes {
/**
* 'Deprecated, use {@code deployment.environment.name} instead.'
* Deprecated, use {@code deployment.environment.name} instead.
*
* @deprecated Replaced by {@code deployment.environment.name}.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ public final class DeviceIncubatingAttributes {
* device. Hardware IDs (e.g. vendor-specific serial number, IMEI or MAC address) MAY be used as
* values.
*
* <p>More information about Android identifier best practices can be found <a
* href="https://developer.android.com/training/articles/user-data-ids">here</a>.
* <p>More information about Android identifier best practices can be found in the <a
* href="https://developer.android.com/training/articles/user-data-ids">Android user data IDs
* guide</a>.
*
* <blockquote>
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public final class EnduserIncubatingAttributes {
/**
* Deprecated, use {@code user.roles} instead.
*
* @deprecated Use {@code user.roles} attribute instead.
* @deprecated Replaced by {@code user.roles}.
*/
@Deprecated public static final AttributeKey<String> ENDUSER_ROLE = stringKey("enduser.role");

Expand Down
Loading
Loading