Skip to content

Commit aba088b

Browse files
jkwatsonjkwatson
authored
Update the semantic convention classes for spec v1.3.0 (open-telemetry#3202)
1 parent cc4720d commit aba088b

5 files changed

Lines changed: 75 additions & 60 deletions

File tree

‎buildscripts/semantic-convention/generate.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44
ROOT_DIR="${SCRIPT_DIR}/../../"
55

66
# freeze the spec & generator tools versions to make SemanticAttributes generation reproducible
7-
SPEC_VERSION=v1.2.0
7+
SPEC_VERSION=v1.3.0
88
GENERATOR_VERSION=0.3.1
99

1010
cd ${SCRIPT_DIR}

‎sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/OsResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private static String getOs(String os) {
8282
} else if (os.startsWith("solaris")) {
8383
return ResourceAttributes.OsTypeValues.SOLARIS;
8484
} else if (os.startsWith("z/os")) {
85-
return ResourceAttributes.OsTypeValues.ZOS;
85+
return ResourceAttributes.OsTypeValues.Z_OS;
8686
}
8787
return null;
8888
}

‎sdk-extensions/resources/src/test/java/io/opentelemetry/sdk/extension/resources/OsResourceTest.java‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,87 +22,98 @@ class OsResourceTest {
2222
@SetSystemProperty(key = "os.name", value = "Linux 4.11")
2323
void linux() {
2424
Attributes attributes = OsResource.buildResource().getAttributes();
25-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("LINUX");
25+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
26+
.isEqualTo(ResourceAttributes.OsTypeValues.LINUX);
2627
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
2728
}
2829

2930
@Test
3031
@SetSystemProperty(key = "os.name", value = "MacOS X 11")
3132
void macos() {
3233
Attributes attributes = OsResource.buildResource().getAttributes();
33-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("DARWIN");
34+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
35+
.isEqualTo(ResourceAttributes.OsTypeValues.DARWIN);
3436
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
3537
}
3638

3739
@Test
3840
@SetSystemProperty(key = "os.name", value = "Windows 10")
3941
void windows() {
4042
Attributes attributes = OsResource.buildResource().getAttributes();
41-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("WINDOWS");
43+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
44+
.isEqualTo(ResourceAttributes.OsTypeValues.WINDOWS);
4245
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
4346
}
4447

4548
@Test
4649
@SetSystemProperty(key = "os.name", value = "FreeBSD 10")
4750
void freebsd() {
4851
Attributes attributes = OsResource.buildResource().getAttributes();
49-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("FREEBSD");
52+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
53+
.isEqualTo(ResourceAttributes.OsTypeValues.FREEBSD);
5054
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
5155
}
5256

5357
@Test
5458
@SetSystemProperty(key = "os.name", value = "NetBSD 10")
5559
void netbsd() {
5660
Attributes attributes = OsResource.buildResource().getAttributes();
57-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("NETBSD");
61+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
62+
.isEqualTo(ResourceAttributes.OsTypeValues.NETBSD);
5863
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
5964
}
6065

6166
@Test
6267
@SetSystemProperty(key = "os.name", value = "OpenBSD 10")
6368
void openbsd() {
6469
Attributes attributes = OsResource.buildResource().getAttributes();
65-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("OPENBSD");
70+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
71+
.isEqualTo(ResourceAttributes.OsTypeValues.OPENBSD);
6672
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
6773
}
6874

6975
@Test
7076
@SetSystemProperty(key = "os.name", value = "DragonFlyBSD 10")
7177
void dragonflybsd() {
7278
Attributes attributes = OsResource.buildResource().getAttributes();
73-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("DRAGONFLYBSD");
79+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
80+
.isEqualTo(ResourceAttributes.OsTypeValues.DRAGONFLYBSD);
7481
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
7582
}
7683

7784
@Test
7885
@SetSystemProperty(key = "os.name", value = "HP-UX 10")
7986
void hpux() {
8087
Attributes attributes = OsResource.buildResource().getAttributes();
81-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("HPUX");
88+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
89+
.isEqualTo(ResourceAttributes.OsTypeValues.HPUX);
8290
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
8391
}
8492

8593
@Test
8694
@SetSystemProperty(key = "os.name", value = "AIX 10")
8795
void aix() {
8896
Attributes attributes = OsResource.buildResource().getAttributes();
89-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("AIX");
97+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
98+
.isEqualTo(ResourceAttributes.OsTypeValues.AIX);
9099
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
91100
}
92101

93102
@Test
94103
@SetSystemProperty(key = "os.name", value = "Solaris 10")
95104
void solaris() {
96105
Attributes attributes = OsResource.buildResource().getAttributes();
97-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("SOLARIS");
106+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
107+
.isEqualTo(ResourceAttributes.OsTypeValues.SOLARIS);
98108
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
99109
}
100110

101111
@Test
102112
@SetSystemProperty(key = "os.name", value = "Z/OS 10")
103113
void zos() {
104114
Attributes attributes = OsResource.buildResource().getAttributes();
105-
assertThat(attributes.get(ResourceAttributes.OS_TYPE)).isEqualTo("ZOS");
115+
assertThat(attributes.get(ResourceAttributes.OS_TYPE))
116+
.isEqualTo(ResourceAttributes.OsTypeValues.Z_OS);
106117
assertThat(attributes.get(ResourceAttributes.OS_DESCRIPTION)).isNotEmpty();
107118
}
108119

‎semconv/src/main/java/io/opentelemetry/semconv/resource/attributes/ResourceAttributes.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -416,27 +416,27 @@ public static final class CloudPlatformValues {
416416
/** AWS Lambda. */
417417
public static final String AWS_LAMBDA = "aws_lambda";
418418
/** AWS Elastic Beanstalk. */
419-
public static final String AWS_ELASTICBEANSTALK = "aws_elastic_beanstalk";
419+
public static final String AWS_ELASTIC_BEANSTALK = "aws_elastic_beanstalk";
420420
/** Azure Virtual Machines. */
421421
public static final String AZURE_VM = "azure_vm";
422422
/** Azure Container Instances. */
423-
public static final String AZURE_CONTAINERINSTANCES = "azure_container_instances";
423+
public static final String AZURE_CONTAINER_INSTANCES = "azure_container_instances";
424424
/** Azure Kubernetes Service. */
425425
public static final String AZURE_AKS = "azure_aks";
426426
/** Azure Functions. */
427427
public static final String AZURE_FUNCTIONS = "azure_functions";
428428
/** Azure App Service. */
429-
public static final String AZURE_APPSERVICE = "azure_app_service";
429+
public static final String AZURE_APP_SERVICE = "azure_app_service";
430430
/** Google Cloud Compute Engine (GCE). */
431-
public static final String GCP_COMPUTEENGINE = "gcp_compute_engine";
431+
public static final String GCP_COMPUTE_ENGINE = "gcp_compute_engine";
432432
/** Google Cloud Run. */
433-
public static final String GCP_CLOUDRUN = "gcp_cloud_run";
433+
public static final String GCP_CLOUD_RUN = "gcp_cloud_run";
434434
/** Google Cloud Kubernetes Engine (GKE). */
435-
public static final String GCP_KUBERNETESENGINE = "gcp_kubernetes_engine";
435+
public static final String GCP_KUBERNETES_ENGINE = "gcp_kubernetes_engine";
436436
/** Google Cloud Functions (GCF). */
437-
public static final String GCP_CLOUDFUNCTIONS = "gcp_cloud_functions";
437+
public static final String GCP_CLOUD_FUNCTIONS = "gcp_cloud_functions";
438438
/** Google Cloud App Engine (GAE). */
439-
public static final String GCP_APPENGINE = "gcp_app_engine";
439+
public static final String GCP_APP_ENGINE = "gcp_app_engine";
440440

441441
private CloudPlatformValues() {}
442442
}
@@ -471,27 +471,27 @@ private HostArchValues() {}
471471

472472
public static final class OsTypeValues {
473473
/** Microsoft Windows. */
474-
public static final String WINDOWS = "WINDOWS";
474+
public static final String WINDOWS = "windows";
475475
/** Linux. */
476-
public static final String LINUX = "LINUX";
476+
public static final String LINUX = "linux";
477477
/** Apple Darwin. */
478-
public static final String DARWIN = "DARWIN";
478+
public static final String DARWIN = "darwin";
479479
/** FreeBSD. */
480-
public static final String FREEBSD = "FREEBSD";
480+
public static final String FREEBSD = "freebsd";
481481
/** NetBSD. */
482-
public static final String NETBSD = "NETBSD";
482+
public static final String NETBSD = "netbsd";
483483
/** OpenBSD. */
484-
public static final String OPENBSD = "OPENBSD";
484+
public static final String OPENBSD = "openbsd";
485485
/** DragonFly BSD. */
486-
public static final String DRAGONFLYBSD = "DRAGONFLYBSD";
486+
public static final String DRAGONFLYBSD = "dragonflybsd";
487487
/** HP-UX (Hewlett Packard Unix). */
488-
public static final String HPUX = "HPUX";
488+
public static final String HPUX = "hpux";
489489
/** AIX (Advanced Interactive eXecutive). */
490-
public static final String AIX = "AIX";
490+
public static final String AIX = "aix";
491491
/** Oracle Solaris. */
492-
public static final String SOLARIS = "SOLARIS";
492+
public static final String SOLARIS = "solaris";
493493
/** IBM z/OS. */
494-
public static final String ZOS = "ZOS";
494+
public static final String Z_OS = "z_os";
495495

496496
private OsTypeValues() {}
497497
}

‎semconv/src/main/java/io/opentelemetry/semconv/trace/attributes/SemanticAttributes.java‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,10 @@ public final class SemanticAttributes {
588588
*/
589589
public static final AttributeKey<String> MESSAGING_OPERATION = stringKey("messaging.operation");
590590

591+
/** RabbitMQ message routing key. */
592+
public static final AttributeKey<String> MESSAGING_RABBITMQ_ROUTING_KEY =
593+
stringKey("messaging.rabbitmq.routing_key");
594+
591595
/**
592596
* Message keys in Kafka are used for grouping alike messages to ensure they&#39;re processed on
593597
* the same partition. They differ from `messaging.message_id` in that they&#39;re not unique. If
@@ -731,28 +735,28 @@ private DbSystemValues() {}
731735
}
732736

733737
public static final class DbCassandraConsistencyLevelValues {
734-
/** ALL. */
735-
public static final String ALL = "ALL";
736-
/** EACH_QUORUM. */
737-
public static final String EACH_QUORUM = "EACH_QUORUM";
738-
/** QUORUM. */
739-
public static final String QUORUM = "QUORUM";
740-
/** LOCAL_QUORUM. */
741-
public static final String LOCAL_QUORUM = "LOCAL_QUORUM";
742-
/** ONE. */
743-
public static final String ONE = "ONE";
744-
/** TWO. */
745-
public static final String TWO = "TWO";
746-
/** THREE. */
747-
public static final String THREE = "THREE";
748-
/** LOCAL_ONE. */
749-
public static final String LOCAL_ONE = "LOCAL_ONE";
750-
/** ANY. */
751-
public static final String ANY = "ANY";
752-
/** SERIAL. */
753-
public static final String SERIAL = "SERIAL";
754-
/** LOCAL_SERIAL. */
755-
public static final String LOCAL_SERIAL = "LOCAL_SERIAL";
738+
/** all. */
739+
public static final String ALL = "all";
740+
/** each_quorum. */
741+
public static final String EACH_QUORUM = "each_quorum";
742+
/** quorum. */
743+
public static final String QUORUM = "quorum";
744+
/** local_quorum. */
745+
public static final String LOCAL_QUORUM = "local_quorum";
746+
/** one. */
747+
public static final String ONE = "one";
748+
/** two. */
749+
public static final String TWO = "two";
750+
/** three. */
751+
public static final String THREE = "three";
752+
/** local_one. */
753+
public static final String LOCAL_ONE = "local_one";
754+
/** any. */
755+
public static final String ANY = "any";
756+
/** serial. */
757+
public static final String SERIAL = "serial";
758+
/** local_serial. */
759+
public static final String LOCAL_SERIAL = "local_serial";
756760

757761
private DbCassandraConsistencyLevelValues() {}
758762
}
@@ -795,14 +799,14 @@ private FaasInvokedProviderValues() {}
795799
}
796800

797801
public static final class NetTransportValues {
798-
/** IP.TCP. */
799-
public static final String IP_TCP = "IP.TCP";
800-
/** IP.UDP. */
801-
public static final String IP_UDP = "IP.UDP";
802+
/** ip_tcp. */
803+
public static final String IP_TCP = "ip_tcp";
804+
/** ip_udp. */
805+
public static final String IP_UDP = "ip_udp";
802806
/** Another IP-based protocol. */
803-
public static final String IP = "IP";
807+
public static final String IP = "ip";
804808
/** Unix Domain socket. See below. */
805-
public static final String UNIX = "Unix";
809+
public static final String UNIX = "unix";
806810
/** Named or anonymous pipe. See note below. */
807811
public static final String PIPE = "pipe";
808812
/** In-process communication. */

0 commit comments

Comments
 (0)