open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update semconv to 1.18.0 (#5188)

This commit is contained in:
jack-berg 2023-02-09 15:25:34 -06:00 committed by GitHub
parent 2b7fe75826
commit 358ad6cba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildscripts/semantic-convention/generate.sh
View File

@ -4,7 +4,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
ROOT_DIR="${SCRIPT_DIR}/../../" ROOT_DIR="${SCRIPT_DIR}/../../"
# freeze the spec & generator tools versions to make SemanticAttributes generation reproducible # freeze the spec & generator tools versions to make SemanticAttributes generation reproducible
SEMCONV_VERSION=1.17.0 SEMCONV_VERSION=1.18.0
SPEC_VERSION=v$SEMCONV_VERSION SPEC_VERSION=v$SEMCONV_VERSION
SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
GENERATOR_VERSION=0.14.0 GENERATOR_VERSION=0.14.0

11
buildscripts/semantic-convention/templates/SemanticAttributes.java.j2
View File

@ -276,5 +276,16 @@ public final class {{class}} {
{% endif %} {% endif %}
{%- if class == "ResourceAttributes" %}
/**
* Red Hat OpenShift on Google Cloud.
* @deprecated This item has been removed as of 1.18.0 of the semantic conventions. Use {@link ResourceAttributes#GCP_OPENSHIFT} instead.
*/
@Deprecated
public static final String GCP_OPENSHIFT = "gcp_openshift";
{% endif %}
private {{class}}() {} private {{class}}() {}
} }

12
semconv/src/main/java/io/opentelemetry/semconv/resource/attributes/ResourceAttributes.java
View File

@ -18,7 +18,7 @@ import java.util.List;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public final class ResourceAttributes { public final class ResourceAttributes {
/** The URL of the OpenTelemetry schema for these keys and values. */ /** The URL of the OpenTelemetry schema for these keys and values. */
public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.17.0"; public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.18.0";
/** /**
* Array of brand name and version separated by a space * Array of brand name and version separated by a space
@ -728,7 +728,7 @@ public final class ResourceAttributes {
/** Google Cloud App Engine (GAE). */ /** Google Cloud App Engine (GAE). */
public static final String GCP_APP_ENGINE = "gcp_app_engine"; public static final String GCP_APP_ENGINE = "gcp_app_engine";
/** Red Hat OpenShift on Google Cloud. */ /** Red Hat OpenShift on Google Cloud. */
public static final String GOOGLE_CLOUD_OPENSHIFT = "google_cloud_openshift"; public static final String GCP_OPENSHIFT = "gcp_openshift";
/** Red Hat OpenShift on IBM Cloud. */ /** Red Hat OpenShift on IBM Cloud. */
public static final String IBM_CLOUD_OPENSHIFT = "ibm_cloud_openshift"; public static final String IBM_CLOUD_OPENSHIFT = "ibm_cloud_openshift";
/** Tencent Cloud Cloud Virtual Machine (CVM). */ /** Tencent Cloud Cloud Virtual Machine (CVM). */
@ -825,5 +825,13 @@ public final class ResourceAttributes {
private TelemetrySdkLanguageValues() {} private TelemetrySdkLanguageValues() {}
} }
/**
* Red Hat OpenShift on Google Cloud.
*
* @deprecated This item has been removed as of 1.18.0 of the semantic conventions. Use {@link
* ResourceAttributes#GCP_OPENSHIFT} instead.
*/
@Deprecated public static final String GCP_OPENSHIFT = "gcp_openshift";
private ResourceAttributes() {} private ResourceAttributes() {}
} }