Skip to content

Commit 13870df

Browse files
committed
Update to semconv 1.35.0
1 parent 1dc2a28 commit 13870df

15 files changed

+438
-52
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ val snapshot = true
1111
// end
1212

1313
// The release version of https://github.com/open-telemetry/semantic-conventions used to generate classes
14-
var semanticConventionsVersion = "1.34.0"
14+
var semanticConventionsVersion = "1.35.0"
1515
val schemaUrlVersions = listOf(
1616
semanticConventionsVersion,
1717
"1.33.0",

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ tasks {
7676
breakIterator(true)
7777

7878
addBooleanOption("html5", true)
79-
// TODO (trask) remove "-html" after next semconv release
80-
// (see https://github.com/open-telemetry/semantic-conventions/pull/2304)
81-
addBooleanOption("Xdoclint:all,-missing,-html", true)
79+
addBooleanOption("Xdoclint:all,-missing", true)
8280
// non-standard option to fail on warnings, see https://bugs.openjdk.java.net/browse/JDK-8200363
8381
addStringOption("Xwerror", "-quiet")
8482
}

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AzIncubatingAttributes.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,18 @@
1414
@SuppressWarnings("unused")
1515
public final class AzIncubatingAttributes {
1616
/**
17-
* <a
18-
* href="https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers">Azure
19-
* Resource Provider Namespace</a> as recognized by the client.
17+
* Deprecated, use {@code azure.resource_provider.namespace} instead.
18+
*
19+
* @deprecated Replaced by {@code azure.resource_provider.namespace}.
2020
*/
21-
public static final AttributeKey<String> AZ_NAMESPACE = stringKey("az.namespace");
21+
@Deprecated public static final AttributeKey<String> AZ_NAMESPACE = stringKey("az.namespace");
2222

2323
/**
24-
* The unique identifier of the service request. It's generated by the Azure service and returned
25-
* with the response.
24+
* Deprecated, use {@code azure.service.request.id} instead.
25+
*
26+
* @deprecated Replaced by {@code azure.service.request.id}.
2627
*/
28+
@Deprecated
2729
public static final AttributeKey<String> AZ_SERVICE_REQUEST_ID =
2830
stringKey("az.service_request_id");
2931

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/AzureIncubatingAttributes.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,21 @@ public final class AzureIncubatingAttributes {
5757
public static final AttributeKey<Long> AZURE_COSMOSDB_RESPONSE_SUB_STATUS_CODE =
5858
longKey("azure.cosmosdb.response.sub_status_code");
5959

60+
/**
61+
* <a
62+
* href="https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers">Azure
63+
* Resource Provider Namespace</a> as recognized by the client.
64+
*/
65+
public static final AttributeKey<String> AZURE_RESOURCE_PROVIDER_NAMESPACE =
66+
stringKey("azure.resource_provider.namespace");
67+
68+
/**
69+
* The unique identifier of the service request. It's generated by the Azure service and returned
70+
* with the response.
71+
*/
72+
public static final AttributeKey<String> AZURE_SERVICE_REQUEST_ID =
73+
stringKey("azure.service.request.id");
74+
6075
// Enum definitions
6176

6277
/** Values for {@link #AZURE_COSMOSDB_CONNECTION_MODE}. */

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/CloudIncubatingAttributes.java

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public final class CloudIncubatingAttributes {
8181
* <li><strong>GCP:</strong> The <a
8282
* href="https://cloud.google.com/iam/docs/full-resource-names">URI of the resource</a>
8383
* <li><strong>Azure:</strong> The <a
84-
* href="https://docs.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified
84+
* href="https://learn.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified
8585
* Resource ID</a> of the invoked function, <em>not</em> the function app, having the form
8686
* {@code
8787
* /subscriptions/<SUBSCRIPTION_GUID>/resourceGroups/<RG>/providers/Microsoft.Web/sites/<FUNCAPP>/functions/<FUNC>}.
@@ -125,6 +125,27 @@ public static final class CloudPlatformIncubatingValues {
125125
/** Red Hat OpenShift on AWS (ROSA) */
126126
public static final String AWS_OPENSHIFT = "aws_openshift";
127127

128+
/** Azure Virtual Machines */
129+
public static final String AZURE_VM = "azure.vm";
130+
131+
/** Azure Container Apps */
132+
public static final String AZURE_CONTAINER_APPS = "azure.container_apps";
133+
134+
/** Azure Container Instances */
135+
public static final String AZURE_CONTAINER_INSTANCES = "azure.container_instances";
136+
137+
/** Azure Kubernetes Service */
138+
public static final String AZURE_AKS = "azure.aks";
139+
140+
/** Azure Functions */
141+
public static final String AZURE_FUNCTIONS = "azure.functions";
142+
143+
/** Azure App Service */
144+
public static final String AZURE_APP_SERVICE = "azure.app_service";
145+
146+
/** Azure Red Hat OpenShift */
147+
public static final String AZURE_OPENSHIFT = "azure.openshift";
148+
128149
/** Azure Virtual Machines */
129150
public static final String AZURE_VM = "azure_vm";
130151

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/DnsIncubatingAttributes.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@
55

66
package io.opentelemetry.semconv.incubating;
77

8+
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
89
import static io.opentelemetry.api.common.AttributeKey.stringKey;
910

1011
import io.opentelemetry.api.common.AttributeKey;
12+
import java.util.List;
1113

1214
// DO NOT EDIT, this is an Auto-generated file from
1315
// buildscripts/templates/registry/incubating_java/IncubatingSemanticAttributes.java.j2
1416
@SuppressWarnings("unused")
1517
public final class DnsIncubatingAttributes {
18+
/** The list of IPv4 or IPv6 addresses resolved during DNS lookup. */
19+
public static final AttributeKey<List<String>> DNS_ANSWERS = stringArrayKey("dns.answers");
20+
1621
/**
1722
* The name being queried.
1823
*

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/GenAiIncubatingAttributes.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,11 +371,17 @@ public static final class GenAiSystemIncubatingValues {
371371
/** Cohere */
372372
public static final String COHERE = "cohere";
373373

374+
/** Azure AI Inference */
375+
public static final String AZURE_AI_INFERENCE = "azure.ai.inference";
376+
377+
/** Azure OpenAI */
378+
public static final String AZURE_AI_OPENAI = "azure.ai.openai";
379+
374380
/** Azure AI Inference */
375381
public static final String AZ_AI_INFERENCE = "az.ai.inference";
376382

377383
/** Azure OpenAI */
378-
public static final String AZ_AI_OPENAI = "az.ai.openai";
384+
public static final String AZ_AI_OPENAI = "azure.ai.openai";
379385

380386
/** IBM Watsonx AI */
381387
public static final String IBM_WATSONX_AI = "ibm.watsonx.ai";

semconv-incubating/src/main/java/io/opentelemetry/semconv/incubating/HttpIncubatingAttributes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public final class HttpIncubatingAttributes {
240240
/**
241241
* Deprecated, use {@code http.response.header.content-length} instead.
242242
*
243-
* @deprecated hp.response.header.content-length
243+
* @deprecated Replaced by {@code http.response.header.content-length}.
244244
*/
245245
@Deprecated
246246
public static final AttributeKey<Long> HTTP_RESPONSE_CONTENT_LENGTH =

0 commit comments

Comments
 (0)