Skip to content

Commit 358ad6c

Browse files
authored
Update semconv to 1.18.0 (#5188)
1 parent 2b7fe75 commit 358ad6c

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

buildscripts/semantic-convention/generate.sh

+1-1
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-
SEMCONV_VERSION=1.17.0
7+
SEMCONV_VERSION=1.18.0
88
SPEC_VERSION=v$SEMCONV_VERSION
99
SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
1010
GENERATOR_VERSION=0.14.0

buildscripts/semantic-convention/templates/SemanticAttributes.java.j2

+11
Original file line numberDiff line numberDiff line change
@@ -276,5 +276,16 @@ public final class {{class}} {
276276

277277
{% endif %}
278278

279+
{%- if class == "ResourceAttributes" %}
280+
281+
/**
282+
* Red Hat OpenShift on Google Cloud.
283+
* @deprecated This item has been removed as of 1.18.0 of the semantic conventions. Use {@link ResourceAttributes#GCP_OPENSHIFT} instead.
284+
*/
285+
@Deprecated
286+
public static final String GCP_OPENSHIFT = "gcp_openshift";
287+
288+
{% endif %}
289+
279290
private {{class}}() {}
280291
}

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

+10-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@SuppressWarnings("unused")
1919
public final class ResourceAttributes {
2020
/** The URL of the OpenTelemetry schema for these keys and values. */
21-
public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.17.0";
21+
public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.18.0";
2222

2323
/**
2424
* Array of brand name and version separated by a space
@@ -728,7 +728,7 @@ public static final class CloudPlatformValues {
728728
/** Google Cloud App Engine (GAE). */
729729
public static final String GCP_APP_ENGINE = "gcp_app_engine";
730730
/** Red Hat OpenShift on Google Cloud. */
731-
public static final String GOOGLE_CLOUD_OPENSHIFT = "google_cloud_openshift";
731+
public static final String GCP_OPENSHIFT = "gcp_openshift";
732732
/** Red Hat OpenShift on IBM Cloud. */
733733
public static final String IBM_CLOUD_OPENSHIFT = "ibm_cloud_openshift";
734734
/** Tencent Cloud Cloud Virtual Machine (CVM). */
@@ -825,5 +825,13 @@ public static final class TelemetrySdkLanguageValues {
825825
private TelemetrySdkLanguageValues() {}
826826
}
827827

828+
/**
829+
* Red Hat OpenShift on Google Cloud.
830+
*
831+
* @deprecated This item has been removed as of 1.18.0 of the semantic conventions. Use {@link
832+
* ResourceAttributes#GCP_OPENSHIFT} instead.
833+
*/
834+
@Deprecated public static final String GCP_OPENSHIFT = "gcp_openshift";
835+
828836
private ResourceAttributes() {}
829837
}

0 commit comments

Comments
 (0)