From b14bed8d899d68d365ef590f5caf201ad95c0cb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 09:56:15 -0700 Subject: [PATCH] Bump com.diffplug.spotless:spotless-plugin-gradle from 6.18.0 to 6.19.0 (#5469) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mateusz Rzeszutek --- buildSrc/build.gradle.kts | 4 +- .../otel.spotless-conventions.gradle.kts | 4 + .../templates/SemanticAttributes.java.j2 | 2 + .../internal/marshal/MarshalerUtil.java | 2 + .../exporter/internal/marshal/Serializer.java | 1 + .../zipkin/OtelToZipkinSpanTransformer.java | 1 + .../internal/metrics/MetricAdapter.java | 2 + .../aggregator/HistogramValueGenerator.java | 1 + .../aggregator/AdaptingIntegerArray.java | 3 + .../io/opentelemetry/sdk/trace/SdkSpan.java | 6 + .../attributes/ResourceAttributes.java | 59 +++++++ .../trace/attributes/SemanticAttributes.java | 157 ++++++++++++++++++ 12 files changed, 241 insertions(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 27d46ae0af..2e21b5d311 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,6 +17,8 @@ spotless { "ktlint_standard_max-line-length" to "disabled", // ktlint makes it *very* hard to locate where this actually happened "ktlint_standard_trailing-comma-on-call-site" to "disabled", + // depends on ktlint_standard_wrapping + "ktlint_standard_trailing-comma-on-declaration-site" to "disabled", // also very hard to find out where this happens "ktlint_standard_wrapping" to "disabled" )) @@ -33,7 +35,7 @@ repositories { dependencies { implementation("com.google.auto.value:auto-value-annotations:1.10.1") // When updating, update above in plugins too - implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0") + implementation("com.diffplug.spotless:spotless-plugin-gradle:6.19.0") // Needed for japicmp but not automatically brought in for some reason. implementation("com.google.guava:guava:32.0.0-jre") implementation("com.squareup:javapoet:1.13.0") diff --git a/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts index 0ed9094fa7..5aec55a040 100644 --- a/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts @@ -32,6 +32,8 @@ spotless { "ktlint_standard_max-line-length" to "disabled", // ktlint makes it *very* hard to locate where this actually happened "ktlint_standard_trailing-comma-on-call-site" to "disabled", + // depends on ktlint_standard_wrapping + "ktlint_standard_trailing-comma-on-declaration-site" to "disabled", // also very hard to find out where this happens "ktlint_standard_wrapping" to "disabled" )) @@ -49,6 +51,8 @@ spotless { "ktlint_standard_max-line-length" to "disabled", // ktlint makes it *very* hard to locate where this actually happened "ktlint_standard_trailing-comma-on-call-site" to "disabled", + // depends on ktlint_standard_wrapping + "ktlint_standard_trailing-comma-on-declaration-site" to "disabled", // also very hard to find out where this happens "ktlint_standard_wrapping" to "disabled" )) diff --git a/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 b/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 index 8d57d1ee0d..af5f4e5599 100644 --- a/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 +++ b/buildscripts/semantic-convention/templates/SemanticAttributes.java.j2 @@ -91,12 +91,14 @@ public final class {{class}} { {%- for member in attribute.attr_type.members %} /** {% filter escape %}{{member.brief | to_doc_brief}}.{% endfilter %} */ public static final {{ type }} {{ member.member_id | to_const_name }} = {{ print_value(type, member.value) }}; + {%- endfor %} {%- if class_name == "NetTransportValues" %} /** @deprecated This item has been removed as of 1.13.0 of the semantic conventions. */ @Deprecated public static final String IP = "ip"; + /** @deprecated This item has been removed as of 1.13.0 of the semantic conventions. */ @Deprecated public static final String UNIX = "unix"; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java index db3e6e9d9f..e0f4c6f25f 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java @@ -212,6 +212,7 @@ public final class MarshalerUtil { } return sizeDoubleOptional(field, value); } + /** Returns the size of a double field. */ public static int sizeDoubleOptional(ProtoFieldInfo field, double value) { return field.getTagSize() + CodedOutputStream.computeDoubleSizeNoTag(value); @@ -224,6 +225,7 @@ public final class MarshalerUtil { } return sizeFixed64Optional(field, value); } + /** Returns the size of a fixed64 field. */ public static int sizeFixed64Optional(ProtoFieldInfo field, long value) { return field.getTagSize() + CodedOutputStream.computeFixed64SizeNoTag(value); diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Serializer.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Serializer.java index 2c396b78b5..e3f36e6f98 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Serializer.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Serializer.java @@ -144,6 +144,7 @@ public abstract class Serializer implements AutoCloseable { } writeDouble(field, value); } + /** Serializes a proto buf {@code double} field. */ public void serializeDoubleOptional(ProtoFieldInfo field, double value) throws IOException { writeDouble(field, value); diff --git a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/OtelToZipkinSpanTransformer.java b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/OtelToZipkinSpanTransformer.java index a67731e99d..0febb9fed3 100644 --- a/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/OtelToZipkinSpanTransformer.java +++ b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/OtelToZipkinSpanTransformer.java @@ -45,6 +45,7 @@ final class OtelToZipkinSpanTransformer { static final String OTEL_STATUS_CODE = "otel.status_code"; static final AttributeKey STATUS_ERROR = stringKey("error"); private final Supplier ipAddressSupplier; + /** * Creates an instance of an OtelToZipkinSpanTransformer with the given Supplier that can produce * an InetAddress, which may be null. This value from this Supplier will be used when creating the diff --git a/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/internal/metrics/MetricAdapter.java b/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/internal/metrics/MetricAdapter.java index f40aaa7bc0..7ea80936d7 100644 --- a/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/internal/metrics/MetricAdapter.java +++ b/opencensus-shim/src/main/java/io/opentelemetry/opencensusshim/internal/metrics/MetricAdapter.java @@ -63,6 +63,7 @@ import javax.annotation.Nullable; */ public final class MetricAdapter { private MetricAdapter() {} + // All OpenCensus metrics come from this shim. // VisibleForTesting. static final InstrumentationScopeInfo INSTRUMENTATION_SCOPE_INFO = @@ -73,6 +74,7 @@ public final class MetricAdapter { private static final Pattern OPENCENSUS_TRACE_ATTACHMENT_PATTERN = Pattern.compile( "SpanContext\\{traceId=TraceId\\{traceId=([0-9A-Ga-g]+)\\}, spanId=SpanId\\{spanId=([0-9A-Ga-g]+)\\},.*\\}"); + /** * Converts an open-census metric into the OTLP format. * diff --git a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramValueGenerator.java b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramValueGenerator.java index 31a3213133..35f45d6f61 100644 --- a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramValueGenerator.java +++ b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/internal/aggregator/HistogramValueGenerator.java @@ -58,6 +58,7 @@ public enum HistogramValueGenerator { return pool[idx.incrementAndGet() % pool.length]; } } + /** Constructs a pool using explicit bucket histogram boundaries. */ private static double[] explicitDefaultBucketPool() { // Add the bucket LE bucket boundaries. diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/AdaptingIntegerArray.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/AdaptingIntegerArray.java index 22405a6e47..b5fb863d88 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/AdaptingIntegerArray.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/AdaptingIntegerArray.java @@ -45,6 +45,7 @@ final class AdaptingIntegerArray { INT, LONG } + /** The current byte size of integer cells in this array. */ private ArrayCellSize cellSize; @@ -160,6 +161,7 @@ final class AdaptingIntegerArray { } return length; } + /** Zeroes out all counts in this array. */ @SuppressWarnings("NullAway") void clear() { @@ -202,6 +204,7 @@ final class AdaptingIntegerArray { this.intBacking = intBacking; this.shortBacking = null; } + /** convert from int => long backing array. */ @SuppressWarnings("NullAway") private void resizeToLong() { diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java index ab2c2d3ada..c6e7263254 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java @@ -67,22 +67,28 @@ final class SdkSpan implements ReadWriteSpan { @GuardedBy("lock") private String name; + // Set of recorded attributes. DO NOT CALL any other method that changes the ordering of events. @GuardedBy("lock") @Nullable private AttributesMap attributes; + // List of recorded events. @GuardedBy("lock") private final List events; + // Number of events recorded. @GuardedBy("lock") private int totalRecordedEvents = 0; + // The status of the span. @GuardedBy("lock") private StatusData status = StatusData.unset(); + // The end time of the span. @GuardedBy("lock") private long endEpochNanos; + // True if the span is ended. @GuardedBy("lock") private boolean hasEnded; diff --git a/semconv/src/main/java/io/opentelemetry/semconv/resource/attributes/ResourceAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/resource/attributes/ResourceAttributes.java index 000033f38b..e2dc4fd0b8 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/resource/attributes/ResourceAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/resource/attributes/ResourceAttributes.java @@ -697,16 +697,22 @@ public final class ResourceAttributes { public static final class CloudProviderValues { /** Alibaba Cloud. */ public static final String ALIBABA_CLOUD = "alibaba_cloud"; + /** Amazon Web Services. */ public static final String AWS = "aws"; + /** Microsoft Azure. */ public static final String AZURE = "azure"; + /** Google Cloud Platform. */ public static final String GCP = "gcp"; + /** Heroku Platform as a Service. */ public static final String HEROKU = "heroku"; + /** IBM Cloud. */ public static final String IBM_CLOUD = "ibm_cloud"; + /** Tencent Cloud. */ public static final String TENCENT_CLOUD = "tencent_cloud"; @@ -716,54 +722,79 @@ public final class ResourceAttributes { public static final class CloudPlatformValues { /** Alibaba Cloud Elastic Compute Service. */ public static final String ALIBABA_CLOUD_ECS = "alibaba_cloud_ecs"; + /** Alibaba Cloud Function Compute. */ public static final String ALIBABA_CLOUD_FC = "alibaba_cloud_fc"; + /** Red Hat OpenShift on Alibaba Cloud. */ public static final String ALIBABA_CLOUD_OPENSHIFT = "alibaba_cloud_openshift"; + /** AWS Elastic Compute Cloud. */ public static final String AWS_EC2 = "aws_ec2"; + /** AWS Elastic Container Service. */ public static final String AWS_ECS = "aws_ecs"; + /** AWS Elastic Kubernetes Service. */ public static final String AWS_EKS = "aws_eks"; + /** AWS Lambda. */ public static final String AWS_LAMBDA = "aws_lambda"; + /** AWS Elastic Beanstalk. */ public static final String AWS_ELASTIC_BEANSTALK = "aws_elastic_beanstalk"; + /** AWS App Runner. */ public static final String AWS_APP_RUNNER = "aws_app_runner"; + /** Red Hat OpenShift on AWS (ROSA). */ public static final String AWS_OPENSHIFT = "aws_openshift"; + /** Azure Virtual Machines. */ public static final String AZURE_VM = "azure_vm"; + /** Azure Container Instances. */ public static final String AZURE_CONTAINER_INSTANCES = "azure_container_instances"; + /** Azure Kubernetes Service. */ public static final String AZURE_AKS = "azure_aks"; + /** Azure Functions. */ public static final String AZURE_FUNCTIONS = "azure_functions"; + /** Azure App Service. */ public static final String AZURE_APP_SERVICE = "azure_app_service"; + /** Azure Red Hat OpenShift. */ public static final String AZURE_OPENSHIFT = "azure_openshift"; + /** Google Cloud Compute Engine (GCE). */ public static final String GCP_COMPUTE_ENGINE = "gcp_compute_engine"; + /** Google Cloud Run. */ public static final String GCP_CLOUD_RUN = "gcp_cloud_run"; + /** Google Cloud Kubernetes Engine (GKE). */ public static final String GCP_KUBERNETES_ENGINE = "gcp_kubernetes_engine"; + /** Google Cloud Functions (GCF). */ public static final String GCP_CLOUD_FUNCTIONS = "gcp_cloud_functions"; + /** Google Cloud App Engine (GAE). */ public static final String GCP_APP_ENGINE = "gcp_app_engine"; + /** Red Hat OpenShift on Google Cloud. */ public static final String GCP_OPENSHIFT = "gcp_openshift"; + /** Red Hat OpenShift on IBM Cloud. */ public static final String IBM_CLOUD_OPENSHIFT = "ibm_cloud_openshift"; + /** Tencent Cloud Cloud Virtual Machine (CVM). */ public static final String TENCENT_CLOUD_CVM = "tencent_cloud_cvm"; + /** Tencent Cloud Elastic Kubernetes Service (EKS). */ public static final String TENCENT_CLOUD_EKS = "tencent_cloud_eks"; + /** Tencent Cloud Serverless Cloud Function (SCF). */ public static final String TENCENT_CLOUD_SCF = "tencent_cloud_scf"; @@ -773,6 +804,7 @@ public final class ResourceAttributes { public static final class AwsEcsLaunchtypeValues { /** ec2. */ public static final String EC2 = "ec2"; + /** fargate. */ public static final String FARGATE = "fargate"; @@ -782,18 +814,25 @@ public final class ResourceAttributes { public static final class HostArchValues { /** AMD64. */ public static final String AMD64 = "amd64"; + /** ARM32. */ public static final String ARM32 = "arm32"; + /** ARM64. */ public static final String ARM64 = "arm64"; + /** Itanium. */ public static final String IA64 = "ia64"; + /** 32-bit PowerPC. */ public static final String PPC32 = "ppc32"; + /** 64-bit PowerPC. */ public static final String PPC64 = "ppc64"; + /** IBM z/Architecture. */ public static final String S390X = "s390x"; + /** 32-bit x86. */ public static final String X86 = "x86"; @@ -803,24 +842,34 @@ public final class ResourceAttributes { public static final class OsTypeValues { /** Microsoft Windows. */ public static final String WINDOWS = "windows"; + /** Linux. */ public static final String LINUX = "linux"; + /** Apple Darwin. */ public static final String DARWIN = "darwin"; + /** FreeBSD. */ public static final String FREEBSD = "freebsd"; + /** NetBSD. */ public static final String NETBSD = "netbsd"; + /** OpenBSD. */ public static final String OPENBSD = "openbsd"; + /** DragonFly BSD. */ public static final String DRAGONFLYBSD = "dragonflybsd"; + /** HP-UX (Hewlett Packard Unix). */ public static final String HPUX = "hpux"; + /** AIX (Advanced Interactive eXecutive). */ public static final String AIX = "aix"; + /** SunOS, Oracle Solaris. */ public static final String SOLARIS = "solaris"; + /** IBM z/OS. */ public static final String Z_OS = "z_os"; @@ -830,24 +879,34 @@ public final class ResourceAttributes { public static final class TelemetrySdkLanguageValues { /** cpp. */ public static final String CPP = "cpp"; + /** dotnet. */ public static final String DOTNET = "dotnet"; + /** erlang. */ public static final String ERLANG = "erlang"; + /** go. */ public static final String GO = "go"; + /** java. */ public static final String JAVA = "java"; + /** nodejs. */ public static final String NODEJS = "nodejs"; + /** php. */ public static final String PHP = "php"; + /** python. */ public static final String PYTHON = "python"; + /** ruby. */ public static final String RUBY = "ruby"; + /** webjs. */ public static final String WEBJS = "webjs"; + /** swift. */ public static final String SWIFT = "swift"; diff --git a/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java b/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java index 33cdc79c76..31f1c01d8a 100644 --- a/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java +++ b/semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java @@ -1134,14 +1134,19 @@ public final class SemanticAttributes { public static final class HttpFlavorValues { /** HTTP/1.0. */ public static final String HTTP_1_0 = "1.0"; + /** HTTP/1.1. */ public static final String HTTP_1_1 = "1.1"; + /** HTTP/2. */ public static final String HTTP_2_0 = "2.0"; + /** HTTP/3. */ public static final String HTTP_3_0 = "3.0"; + /** SPDY protocol. */ public static final String SPDY = "SPDY"; + /** QUIC protocol. */ public static final String QUIC = "QUIC"; @@ -1151,8 +1156,10 @@ public final class SemanticAttributes { public static final class EventDomainValues { /** Events from browser apps. */ public static final String BROWSER = "browser"; + /** Events from mobile apps. */ public static final String DEVICE = "device"; + /** Events from Kubernetes. */ public static final String K8S = "k8s"; @@ -1162,6 +1169,7 @@ public final class SemanticAttributes { public static final class OpentracingRefTypeValues { /** The parent Span depends on the child Span in some capacity. */ public static final String CHILD_OF = "child_of"; + /** The parent Span does not depend in any way on the result of the child Span. */ public static final String FOLLOWS_FROM = "follows_from"; @@ -1171,104 +1179,154 @@ public final class SemanticAttributes { public static final class DbSystemValues { /** Some other SQL database. Fallback only. See notes. */ public static final String OTHER_SQL = "other_sql"; + /** Microsoft SQL Server. */ public static final String MSSQL = "mssql"; + /** Microsoft SQL Server Compact. */ public static final String MSSQLCOMPACT = "mssqlcompact"; + /** MySQL. */ public static final String MYSQL = "mysql"; + /** Oracle Database. */ public static final String ORACLE = "oracle"; + /** IBM Db2. */ public static final String DB2 = "db2"; + /** PostgreSQL. */ public static final String POSTGRESQL = "postgresql"; + /** Amazon Redshift. */ public static final String REDSHIFT = "redshift"; + /** Apache Hive. */ public static final String HIVE = "hive"; + /** Cloudscape. */ public static final String CLOUDSCAPE = "cloudscape"; + /** HyperSQL DataBase. */ public static final String HSQLDB = "hsqldb"; + /** Progress Database. */ public static final String PROGRESS = "progress"; + /** SAP MaxDB. */ public static final String MAXDB = "maxdb"; + /** SAP HANA. */ public static final String HANADB = "hanadb"; + /** Ingres. */ public static final String INGRES = "ingres"; + /** FirstSQL. */ public static final String FIRSTSQL = "firstsql"; + /** EnterpriseDB. */ public static final String EDB = "edb"; + /** InterSystems Caché. */ public static final String CACHE = "cache"; + /** Adabas (Adaptable Database System). */ public static final String ADABAS = "adabas"; + /** Firebird. */ public static final String FIREBIRD = "firebird"; + /** Apache Derby. */ public static final String DERBY = "derby"; + /** FileMaker. */ public static final String FILEMAKER = "filemaker"; + /** Informix. */ public static final String INFORMIX = "informix"; + /** InstantDB. */ public static final String INSTANTDB = "instantdb"; + /** InterBase. */ public static final String INTERBASE = "interbase"; + /** MariaDB. */ public static final String MARIADB = "mariadb"; + /** Netezza. */ public static final String NETEZZA = "netezza"; + /** Pervasive PSQL. */ public static final String PERVASIVE = "pervasive"; + /** PointBase. */ public static final String POINTBASE = "pointbase"; + /** SQLite. */ public static final String SQLITE = "sqlite"; + /** Sybase. */ public static final String SYBASE = "sybase"; + /** Teradata. */ public static final String TERADATA = "teradata"; + /** Vertica. */ public static final String VERTICA = "vertica"; + /** H2. */ public static final String H2 = "h2"; + /** ColdFusion IMQ. */ public static final String COLDFUSION = "coldfusion"; + /** Apache Cassandra. */ public static final String CASSANDRA = "cassandra"; + /** Apache HBase. */ public static final String HBASE = "hbase"; + /** MongoDB. */ public static final String MONGODB = "mongodb"; + /** Redis. */ public static final String REDIS = "redis"; + /** Couchbase. */ public static final String COUCHBASE = "couchbase"; + /** CouchDB. */ public static final String COUCHDB = "couchdb"; + /** Microsoft Azure Cosmos DB. */ public static final String COSMOSDB = "cosmosdb"; + /** Amazon DynamoDB. */ public static final String DYNAMODB = "dynamodb"; + /** Neo4j. */ public static final String NEO4J = "neo4j"; + /** Apache Geode. */ public static final String GEODE = "geode"; + /** Elasticsearch. */ public static final String ELASTICSEARCH = "elasticsearch"; + /** Memcached. */ public static final String MEMCACHED = "memcached"; + /** CockroachDB. */ public static final String COCKROACHDB = "cockroachdb"; + /** OpenSearch. */ public static final String OPENSEARCH = "opensearch"; + /** ClickHouse. */ public static final String CLICKHOUSE = "clickhouse"; + /** Cloud Spanner. */ public static final String SPANNER = "spanner"; @@ -1278,24 +1336,34 @@ public final class SemanticAttributes { public static final class DbCassandraConsistencyLevelValues { /** all. */ public static final String ALL = "all"; + /** each_quorum. */ public static final String EACH_QUORUM = "each_quorum"; + /** quorum. */ public static final String QUORUM = "quorum"; + /** local_quorum. */ public static final String LOCAL_QUORUM = "local_quorum"; + /** one. */ public static final String ONE = "one"; + /** two. */ public static final String TWO = "two"; + /** three. */ public static final String THREE = "three"; + /** local_one. */ public static final String LOCAL_ONE = "local_one"; + /** any. */ public static final String ANY = "any"; + /** serial. */ public static final String SERIAL = "serial"; + /** local_serial. */ public static final String LOCAL_SERIAL = "local_serial"; @@ -1308,6 +1376,7 @@ public final class SemanticAttributes { * successfully. */ public static final String OK = "OK"; + /** The operation contains an error. */ public static final String ERROR = "ERROR"; @@ -1317,12 +1386,16 @@ public final class SemanticAttributes { public static final class FaasTriggerValues { /** A response to some data source operation such as a database or filesystem read/write. */ public static final String DATASOURCE = "datasource"; + /** To provide an answer to an inbound HTTP request. */ public static final String HTTP = "http"; + /** A function is set to be executed when messages are sent to a messaging system. */ public static final String PUBSUB = "pubsub"; + /** A function is scheduled to be executed regularly. */ public static final String TIMER = "timer"; + /** If none of the others apply. */ public static final String OTHER = "other"; @@ -1332,8 +1405,10 @@ public final class SemanticAttributes { public static final class FaasDocumentOperationValues { /** When a new object is created. */ public static final String INSERT = "insert"; + /** When an object is modified. */ public static final String EDIT = "edit"; + /** When an object is deleted. */ public static final String DELETE = "delete"; @@ -1343,12 +1418,16 @@ public final class SemanticAttributes { public static final class FaasInvokedProviderValues { /** Alibaba Cloud. */ public static final String ALIBABA_CLOUD = "alibaba_cloud"; + /** Amazon Web Services. */ public static final String AWS = "aws"; + /** Microsoft Azure. */ public static final String AZURE = "azure"; + /** Google Cloud Platform. */ public static final String GCP = "gcp"; + /** Tencent Cloud. */ public static final String TENCENT_CLOUD = "tencent_cloud"; @@ -1358,18 +1437,24 @@ public final class SemanticAttributes { public static final class NetTransportValues { /** ip_tcp. */ public static final String IP_TCP = "ip_tcp"; + /** ip_udp. */ public static final String IP_UDP = "ip_udp"; + /** Named or anonymous pipe. See note below. */ public static final String PIPE = "pipe"; + /** In-process communication. */ public static final String INPROC = "inproc"; + /** Something else (non IP-based). */ public static final String OTHER = "other"; + /** * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. */ @Deprecated public static final String IP = "ip"; + /** * @deprecated This item has been removed as of 1.13.0 of the semantic conventions. */ @@ -1381,8 +1466,10 @@ public final class SemanticAttributes { public static final class NetSockFamilyValues { /** IPv4 address. */ public static final String INET = "inet"; + /** IPv6 address. */ public static final String INET6 = "inet6"; + /** Unix domain socket path. */ public static final String UNIX = "unix"; @@ -1392,12 +1479,16 @@ public final class SemanticAttributes { public static final class NetHostConnectionTypeValues { /** wifi. */ public static final String WIFI = "wifi"; + /** wired. */ public static final String WIRED = "wired"; + /** cell. */ public static final String CELL = "cell"; + /** unavailable. */ public static final String UNAVAILABLE = "unavailable"; + /** unknown. */ public static final String UNKNOWN = "unknown"; @@ -1407,44 +1498,64 @@ public final class SemanticAttributes { public static final class NetHostConnectionSubtypeValues { /** GPRS. */ public static final String GPRS = "gprs"; + /** EDGE. */ public static final String EDGE = "edge"; + /** UMTS. */ public static final String UMTS = "umts"; + /** CDMA. */ public static final String CDMA = "cdma"; + /** EVDO Rel. 0. */ public static final String EVDO_0 = "evdo_0"; + /** EVDO Rev. A. */ public static final String EVDO_A = "evdo_a"; + /** CDMA2000 1XRTT. */ public static final String CDMA2000_1XRTT = "cdma2000_1xrtt"; + /** HSDPA. */ public static final String HSDPA = "hsdpa"; + /** HSUPA. */ public static final String HSUPA = "hsupa"; + /** HSPA. */ public static final String HSPA = "hspa"; + /** IDEN. */ public static final String IDEN = "iden"; + /** EVDO Rev. B. */ public static final String EVDO_B = "evdo_b"; + /** LTE. */ public static final String LTE = "lte"; + /** EHRPD. */ public static final String EHRPD = "ehrpd"; + /** HSPAP. */ public static final String HSPAP = "hspap"; + /** GSM. */ public static final String GSM = "gsm"; + /** TD-SCDMA. */ public static final String TD_SCDMA = "td_scdma"; + /** IWLAN. */ public static final String IWLAN = "iwlan"; + /** 5G NR (New Radio). */ public static final String NR = "nr"; + /** 5G NRNSA (New Radio Non-Standalone). */ public static final String NRNSA = "nrnsa"; + /** LTE CA. */ public static final String LTE_CA = "lte_ca"; @@ -1454,8 +1565,10 @@ public final class SemanticAttributes { public static final class GraphqlOperationTypeValues { /** GraphQL query. */ public static final String QUERY = "query"; + /** GraphQL mutation. */ public static final String MUTATION = "mutation"; + /** GraphQL subscription. */ public static final String SUBSCRIPTION = "subscription"; @@ -1465,6 +1578,7 @@ public final class SemanticAttributes { public static final class MessagingDestinationKindValues { /** A message sent to a queue. */ public static final String QUEUE = "queue"; + /** A message sent to a topic. */ public static final String TOPIC = "topic"; @@ -1474,6 +1588,7 @@ public final class SemanticAttributes { public static final class MessagingSourceKindValues { /** A message received from a queue. */ public static final String QUEUE = "queue"; + /** A message received from a topic. */ public static final String TOPIC = "topic"; @@ -1483,8 +1598,10 @@ public final class SemanticAttributes { public static final class MessagingOperationValues { /** publish. */ public static final String PUBLISH = "publish"; + /** receive. */ public static final String RECEIVE = "receive"; + /** process. */ public static final String PROCESS = "process"; @@ -1494,10 +1611,13 @@ public final class SemanticAttributes { public static final class MessagingRocketmqMessageTypeValues { /** Normal message. */ public static final String NORMAL = "normal"; + /** FIFO message. */ public static final String FIFO = "fifo"; + /** Delay message. */ public static final String DELAY = "delay"; + /** Transaction message. */ public static final String TRANSACTION = "transaction"; @@ -1507,6 +1627,7 @@ public final class SemanticAttributes { public static final class MessagingRocketmqConsumptionModelValues { /** Clustering consumption model. */ public static final String CLUSTERING = "clustering"; + /** Broadcasting consumption model. */ public static final String BROADCASTING = "broadcasting"; @@ -1516,12 +1637,16 @@ public final class SemanticAttributes { public static final class RpcSystemValues { /** gRPC. */ public static final String GRPC = "grpc"; + /** Java RMI. */ public static final String JAVA_RMI = "java_rmi"; + /** .NET WCF. */ public static final String DOTNET_WCF = "dotnet_wcf"; + /** Apache Dubbo. */ public static final String APACHE_DUBBO = "apache_dubbo"; + /** Connect RPC. */ public static final String CONNECT_RPC = "connect_rpc"; @@ -1531,36 +1656,52 @@ public final class SemanticAttributes { public static final class RpcGrpcStatusCodeValues { /** OK. */ public static final long OK = 0; + /** CANCELLED. */ public static final long CANCELLED = 1; + /** UNKNOWN. */ public static final long UNKNOWN = 2; + /** INVALID_ARGUMENT. */ public static final long INVALID_ARGUMENT = 3; + /** DEADLINE_EXCEEDED. */ public static final long DEADLINE_EXCEEDED = 4; + /** NOT_FOUND. */ public static final long NOT_FOUND = 5; + /** ALREADY_EXISTS. */ public static final long ALREADY_EXISTS = 6; + /** PERMISSION_DENIED. */ public static final long PERMISSION_DENIED = 7; + /** RESOURCE_EXHAUSTED. */ public static final long RESOURCE_EXHAUSTED = 8; + /** FAILED_PRECONDITION. */ public static final long FAILED_PRECONDITION = 9; + /** ABORTED. */ public static final long ABORTED = 10; + /** OUT_OF_RANGE. */ public static final long OUT_OF_RANGE = 11; + /** UNIMPLEMENTED. */ public static final long UNIMPLEMENTED = 12; + /** INTERNAL. */ public static final long INTERNAL = 13; + /** UNAVAILABLE. */ public static final long UNAVAILABLE = 14; + /** DATA_LOSS. */ public static final long DATA_LOSS = 15; + /** UNAUTHENTICATED. */ public static final long UNAUTHENTICATED = 16; @@ -1570,6 +1711,7 @@ public final class SemanticAttributes { public static final class MessageTypeValues { /** sent. */ public static final String SENT = "SENT"; + /** received. */ public static final String RECEIVED = "RECEIVED"; @@ -1579,34 +1721,49 @@ public final class SemanticAttributes { public static final class RpcConnectRpcErrorCodeValues { /** cancelled. */ public static final String CANCELLED = "cancelled"; + /** unknown. */ public static final String UNKNOWN = "unknown"; + /** invalid_argument. */ public static final String INVALID_ARGUMENT = "invalid_argument"; + /** deadline_exceeded. */ public static final String DEADLINE_EXCEEDED = "deadline_exceeded"; + /** not_found. */ public static final String NOT_FOUND = "not_found"; + /** already_exists. */ public static final String ALREADY_EXISTS = "already_exists"; + /** permission_denied. */ public static final String PERMISSION_DENIED = "permission_denied"; + /** resource_exhausted. */ public static final String RESOURCE_EXHAUSTED = "resource_exhausted"; + /** failed_precondition. */ public static final String FAILED_PRECONDITION = "failed_precondition"; + /** aborted. */ public static final String ABORTED = "aborted"; + /** out_of_range. */ public static final String OUT_OF_RANGE = "out_of_range"; + /** unimplemented. */ public static final String UNIMPLEMENTED = "unimplemented"; + /** internal. */ public static final String INTERNAL = "internal"; + /** unavailable. */ public static final String UNAVAILABLE = "unavailable"; + /** data_loss. */ public static final String DATA_LOSS = "data_loss"; + /** unauthenticated. */ public static final String UNAUTHENTICATED = "unauthenticated";