Skip to content

Commit

Permalink
feat: upgrade semantic conventions to the latest 1.6.1 version (#2456)
Browse files Browse the repository at this point in the history
Regenerated the `@opentelemetry-js/semantic-conventions`-package to use
the latest definitions from the Opentelemetry specification

Co-authored-by: Weyert de Boer <[email protected]>
Co-authored-by: Valentin Marchaud <[email protected]>
  • Loading branch information
3 people authored Sep 6, 2021
1 parent 7b01cfa commit bec7791
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ export const SemanticResourceAttributes = {
CLOUD_ACCOUNT_ID: 'cloud.account.id',

/**
* The geographical region the resource is running. Refer to your provider&#39;s docs to see the available regions, for example [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/en-us/global-infrastructure/geographies/), or [Google Cloud regions](https://cloud.google.com/about/locations).
* The geographical region the resource is running. Refer to your provider&#39;s docs to see the available regions, for example [Alibaba Cloud regions](https://www.alibabacloud.com/help/doc-detail/40654.htm), [AWS regions](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/), [Azure regions](https://azure.microsoft.com/en-us/global-infrastructure/geographies/), or [Google Cloud regions](https://cloud.google.com/about/locations).
*/
CLOUD_REGION: 'cloud.region',

/**
* Cloud regions often have multiple, isolated locations known as zones to increase availability. Availability zone represents the zone where the resource is running.
*
* Note: Availability zones are called &#34;zones&#34; on Google Cloud.
* Note: Availability zones are called &#34;zones&#34; on Alibaba Cloud and Google Cloud.
*/
CLOUD_AVAILABILITY_ZONE: 'cloud.availability_zone',

Expand Down Expand Up @@ -480,6 +480,8 @@ As an alternative, consider setting `faas.id` as a span attribute instead.


export enum CloudProviderValues {
/** Alibaba Cloud. */
ALIBABA_CLOUD = 'alibaba_cloud',
/** Amazon Web Services. */
AWS = 'aws',
/** Microsoft Azure. */
Expand All @@ -492,6 +494,10 @@ export enum CloudProviderValues {


export enum CloudPlatformValues {
/** Alibaba Cloud Elastic Compute Service. */
ALIBABA_CLOUD_ECS = 'alibaba_cloud_ecs',
/** Alibaba Cloud Function Compute. */
ALIBABA_CLOUD_FC = 'alibaba_cloud_fc',
/** AWS Elastic Compute Cloud. */
AWS_EC2 = 'aws_ec2',
/** AWS Elastic Container Service. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,36 @@ clear whether the exception will escape.
*/
NET_HOST_NAME: 'net.host.name',

/**
* The internet connection type currently being used by the host.
*/
NET_HOST_CONNECTION_TYPE: 'net.host.connection.type',

/**
* This describes more details regarding the connection.type. It may be the type of cell technology connection, but it could be used for describing details about a wifi connection.
*/
NET_HOST_CONNECTION_SUBTYPE: 'net.host.connection.subtype',

/**
* The name of the mobile carrier.
*/
NET_HOST_CARRIER_NAME: 'net.host.carrier.name',

/**
* The mobile carrier country code.
*/
NET_HOST_CARRIER_MCC: 'net.host.carrier.mcc',

/**
* The mobile carrier network code.
*/
NET_HOST_CARRIER_MNC: 'net.host.carrier.mnc',

/**
* The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network.
*/
NET_HOST_CARRIER_ICC: 'net.host.carrier.icc',

/**
* The [`service.name`](../../resource/semantic_conventions/README.md#service) of the remote service. SHOULD be equal to the actual `service.name` resource attribute of the remote service if any.
*/
Expand Down Expand Up @@ -814,6 +844,8 @@ export enum FaasDocumentOperationValues {


export enum FaasInvokedProviderValues {
/** Alibaba Cloud. */
ALIBABA_CLOUD = 'alibaba_cloud',
/** Amazon Web Services. */
AWS = 'aws',
/** Microsoft Azure. */
Expand Down Expand Up @@ -845,6 +877,70 @@ export enum NetTransportValues {



export enum NetHostConnectionTypeValues {
/** wifi. */
WIFI = 'wifi',
/** wired. */
WIRED = 'wired',
/** cell. */
CELL = 'cell',
/** unavailable. */
UNAVAILABLE = 'unavailable',
/** unknown. */
UNKNOWN = 'unknown',
}




export enum NetHostConnectionSubtypeValues {
/** GPRS. */
GPRS = 'gprs',
/** EDGE. */
EDGE = 'edge',
/** UMTS. */
UMTS = 'umts',
/** CDMA. */
CDMA = 'cdma',
/** EVDO Rel. 0. */
EVDO_0 = 'evdo_0',
/** EVDO Rev. A. */
EVDO_A = 'evdo_a',
/** CDMA2000 1XRTT. */
CDMA2000_1XRTT = 'cdma2000_1xrtt',
/** HSDPA. */
HSDPA = 'hsdpa',
/** HSUPA. */
HSUPA = 'hsupa',
/** HSPA. */
HSPA = 'hspa',
/** IDEN. */
IDEN = 'iden',
/** EVDO Rev. B. */
EVDO_B = 'evdo_b',
/** LTE. */
LTE = 'lte',
/** EHRPD. */
EHRPD = 'ehrpd',
/** HSPAP. */
HSPAP = 'hspap',
/** GSM. */
GSM = 'gsm',
/** TD-SCDMA. */
TD_SCDMA = 'td_scdma',
/** IWLAN. */
IWLAN = 'iwlan',
/** 5G NR (New Radio). */
NR = 'nr',
/** 5G NRNSA (New Radio Non-Standalone). */
NRNSA = 'nrnsa',
/** LTE CA. */
LTE_CA = 'lte_ca',
}




export enum HttpFlavorValues {
/** HTTP 1.0. */
HTTP_1_0 = '1.0',
Expand Down
4 changes: 2 additions & 2 deletions scripts/semconv/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
ROOT_DIR="${SCRIPT_DIR}/../../"

# freeze the spec version to make SpanAttributess generation reproducible
SPEC_VERSION=v1.5.0
GENERATOR_VERSION=0.3.1
SPEC_VERSION=v1.6.1
GENERATOR_VERSION=0.5.0

cd ${SCRIPT_DIR}

Expand Down

0 comments on commit bec7791

Please sign in to comment.