Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update semconv to 1.18.0 #5188

Merged
merged 1 commit into from
Feb 9, 2023
+22 −3
Merged

Update semconv to 1.18.0 #5188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildscripts/semantic-convention/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
ROOT_DIR="${SCRIPT_DIR}/../../"

# 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
SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
GENERATOR_VERSION=0.14.0
Expand Down
11 changes: 11 additions & 0 deletions buildscripts/semantic-convention/templates/SemanticAttributes.java.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,5 +276,16 @@ public final class {{class}} {

{% 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}}() {}
}
12 changes: 10 additions & 2 deletions semconv/src/main/java/io/opentelemetry/semconv/resource/attributes/ResourceAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@SuppressWarnings("unused")
public final class ResourceAttributes {
/** 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
Expand Down Expand Up @@ -728,7 +728,7 @@ public static final class CloudPlatformValues {
/** 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 GOOGLE_CLOUD_OPENSHIFT = "google_cloud_openshift";
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). */
Expand Down Expand Up @@ -825,5 +825,13 @@ public static final class 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() {}
}