diff --git a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelPropertyRule.java b/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelPropertyRule.java new file mode 100644 index 00000000000..990796366bd --- /dev/null +++ b/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelPropertyRule.java @@ -0,0 +1,129 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.gradle.js2p; + +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; +import com.sun.codemodel.JAnnotationUse; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JFieldVar; +import com.sun.codemodel.JMethod; +import org.jsonschema2pojo.Schema; +import org.jsonschema2pojo.exception.GenerationException; +import org.jsonschema2pojo.rules.PropertyRule; +import org.jsonschema2pojo.rules.RuleFactory; + +/** + * A {@link PropertyRule} that emits each property's {@code description} only on its getter. + * + *

By default jsonschema2pojo writes a property description in three places: the field javadoc, + * the getter javadoc, and a {@code @JsonPropertyDescription} annotation on the field. The getter is + * the public API surface users discover, so we consolidate the description there and drop the field + * javadoc and annotation. + * + *

This also fixes a jsonschema2pojo limitation: it follows draft-03/04 semantics where a {@code + * $ref} replaces its sibling keywords, so a {@code description} written as a sibling of {@code $ref} + * is dropped entirely. The configuration schema is draft 2020-12, where {@code $ref} siblings are + * valid; re-applying from the original node restores those descriptions on the getter too. + * + *

Mechanism: strip {@code description} from the node before delegating to {@link + * PropertyRule#apply} so the superclass adds it nowhere (not the field javadoc, the getter javadoc, + * or a {@code @JsonPropertyDescription}), then apply it to the getter only — leaving fields without + * any javadoc. + */ +public class OtelPropertyRule extends PropertyRule { + + private static final String JSON_PROPERTY_DESCRIPTION = JsonPropertyDescription.class.getName(); + + private final RuleFactory ruleFactory; + + OtelPropertyRule(RuleFactory ruleFactory) { + super(ruleFactory); + this.ruleFactory = ruleFactory; + } + + @Override + public JDefinedClass apply( + String nodeName, JsonNode node, JsonNode parent, JDefinedClass jclass, Schema schema) { + JsonNode description = node.get("description"); + + // Delegate with the description removed so the superclass places it nowhere; we re-apply it to + // the getter below. + JsonNode delegateNode = node; + if (description != null && node.isObject()) { + delegateNode = node.deepCopy(); + ((ObjectNode) delegateNode).remove("description"); + } + + JDefinedClass result = super.apply(nodeName, delegateNode, parent, jclass, schema); + + String propertyName = ruleFactory.getNameHelper().getPropertyName(nodeName, node); + JFieldVar field = result.fields().get(propertyName); + if (field == null) { + return result; + } + + if (hasDescriptionAnnotation(field)) { + throw new GenerationException( + "Property '" + + nodeName + + "' resolves to a type that defines its own top-level description. Descriptions on" + + " $defs are not handled (they would duplicate onto the field). See " + + OtelPropertyRule.class.getName() + + "."); + } + + if (description != null) { + applyGetterDescription(nodeName, node, schema, result, propertyName, field, description); + } + return result; + } + + private void applyGetterDescription( + String nodeName, + JsonNode node, + Schema schema, + JDefinedClass jclass, + String propertyName, + JFieldVar field, + JsonNode description) { + String getterName = ruleFactory.getNameHelper().getGetterName(propertyName, field.type(), node); + for (JMethod method : jclass.methods()) { + if (method.name().equals(getterName)) { + ruleFactory + .getDescriptionRule() + .apply(nodeName, preserveLineBreaks(description), node, method, schema); + return; + } + } + } + + // google-java-format reflows javadoc prose, collapsing the schema's single newlines into spaces + // (only blank lines survive, rendered as

). Promote each interior lone newline to a blank line + // so every original line becomes its own

paragraph. Existing blank lines are left alone, as is + // a trailing newline (so the description doesn't gain a stray trailing blank paragraph). + private static JsonNode preserveLineBreaks(JsonNode description) { + String text = description.asText(); + if (text.indexOf('\n') < 0) { + return description; + } + boolean trailingNewline = text.endsWith("\n"); + String body = trailingNewline ? text.substring(0, text.length() - 1) : text; + body = body.replaceAll("(? + *

  • {@link OtelObjectRule} — AutoValue-style {@code toString}/{@code equals}/{@code hashCode} + * instead of jsonschema2pojo's defaults, and routes experimental classes into the {@code + * internal} sub-package. + *
  • {@link OtelEnumRule} — routes top-level experimental enums into the {@code internal} + * sub-package, mirroring {@link OtelObjectRule} for classes. + *
  • {@link OtelPropertyRule} — restores property descriptions written as siblings of {@code + * $ref}, which jsonschema2pojo otherwise drops. + * * *

    Referenced from {@code sdk-extensions/declarative-config/build.gradle.kts} via {@code * jsonSchema2Pojo.customRuleFactory}. @@ -33,4 +42,23 @@ public Rule getObjectRule() { public Rule getEnumRule() { return new OtelEnumRule(this); } + + @Override + public Rule getPropertyRule() { + return new OtelPropertyRule(this); + } + + // The opentelemetry-configuration schema already documents required-ness in each required + // property's description ("Property is required and must be non-null."), so jsonschema2pojo's + // "(Required)" javadoc is purely duplicative. No-op the required rules to drop it. With JSR-303 + // and JSR-305 annotations disabled, the "(Required)" javadoc is these rules' only effect. + @Override + public Rule getRequiredArrayRule() { + return (nodeName, node, parent, generatableType, schema) -> generatableType; + } + + @Override + public Rule getRequiredRule() { + return (nodeName, node, parent, generatableType, schema) -> generatableType; + } } diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AggregationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AggregationModel.java index aabed475abe..da8fdcbf823 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AggregationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AggregationModel.java @@ -47,6 +47,14 @@ public class AggregationModel { @Nullable private SumAggregationModel sum; + /** + * Configures the stream to use the instrument kind to select an aggregation and advisory + * parameters to influence aggregation configuration parameters. See + * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#default-aggregation + * for details. + * + *

    If omitted, ignore. + */ @JsonProperty("default") @Nullable public DefaultAggregationModel getDefault() { @@ -58,6 +66,13 @@ public AggregationModel withDefault(DefaultAggregationModel _default) { return this; } + /** + * Configures the stream to ignore/drop all instrument measurements. See + * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#drop-aggregation + * for details. + * + *

    If omitted, ignore. + */ @JsonProperty("drop") @Nullable public DropAggregationModel getDrop() { @@ -69,6 +84,14 @@ public AggregationModel withDrop(DropAggregationModel drop) { return this; } + /** + * Configures the stream to collect data for the histogram metric point using a set of explicit + * boundary values for histogram bucketing. See + * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#explicit-bucket-histogram-aggregation + * for details + * + *

    If omitted, ignore. + */ @JsonProperty("explicit_bucket_histogram") @Nullable public ExplicitBucketHistogramAggregationModel getExplicitBucketHistogram() { @@ -81,6 +104,15 @@ public AggregationModel withExplicitBucketHistogram( return this; } + /** + * Configures the stream to collect data for the exponential histogram metric point, which uses a + * base-2 exponential formula to determine bucket boundaries and an integer scale parameter to + * control resolution. See + * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#base2-exponential-bucket-histogram-aggregation + * for details. + * + *

    If omitted, ignore. + */ @JsonProperty("base2_exponential_bucket_histogram") @Nullable public Base2ExponentialBucketHistogramAggregationModel getBase2ExponentialBucketHistogram() { @@ -93,6 +125,13 @@ public AggregationModel withBase2ExponentialBucketHistogram( return this; } + /** + * Configures the stream to collect data using the last measurement. See + * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#last-value-aggregation + * for details. + * + *

    If omitted, ignore. + */ @JsonProperty("last_value") @Nullable public LastValueAggregationModel getLastValue() { @@ -104,6 +143,13 @@ public AggregationModel withLastValue(LastValueAggregationModel lastValue) { return this; } + /** + * Configures the stream to collect the arithmetic sum of measurement values. See + * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#sum-aggregation + * for details. + * + *

    If omitted, ignore. + */ @JsonProperty("sum") @Nullable public SumAggregationModel getSum() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeLimitsModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeLimitsModel.java index 960dff18384..0fec10271a1 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeLimitsModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeLimitsModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,26 +16,20 @@ @Generated("jsonschema2pojo") public class AttributeLimitsModel { - /** - * Configure max attribute value size. Value must be non-negative. If omitted or null, there is no - * limit. - */ @JsonProperty("attribute_value_length_limit") - @JsonPropertyDescription( - "Configure max attribute value size. \nValue must be non-negative.\nIf omitted or null, there is no limit.\n") @Nullable private Integer attributeValueLengthLimit; - /** Configure max attribute count. Value must be non-negative. If omitted or null, 128 is used. */ @JsonProperty("attribute_count_limit") - @JsonPropertyDescription( - "Configure max attribute count. \nValue must be non-negative.\nIf omitted or null, 128 is used.\n") @Nullable private Integer attributeCountLimit; /** - * Configure max attribute value size. Value must be non-negative. If omitted or null, there is no - * limit. + * Configure max attribute value size. + * + *

    Value must be non-negative. + * + *

    If omitted or null, there is no limit. */ @JsonProperty("attribute_value_length_limit") @Nullable @@ -49,7 +42,13 @@ public AttributeLimitsModel withAttributeValueLengthLimit(Integer attributeValue return this; } - /** Configure max attribute count. Value must be non-negative. If omitted or null, 128 is used. */ + /** + * Configure max attribute count. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 128 is used. + */ @JsonProperty("attribute_count_limit") @Nullable public Integer getAttributeCountLimit() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeNameValueModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeNameValueModel.java index 919dba5ea67..85dcaec0e99 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeNameValueModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeNameValueModel.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; @@ -21,25 +20,11 @@ @Generated("jsonschema2pojo") public class AttributeNameValueModel { - /** - * The attribute name. Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("name") - @JsonPropertyDescription("The attribute name.\nProperty is required and must be non-null.\n") @Nullable private String name; - /** - * The attribute value. The type of value must match .type. Property must be present, but if null - * the entry is ignored. - * - *

    (Required) - */ @JsonProperty("value") - @JsonPropertyDescription( - "The attribute value.\nThe type of value must match .type.\nProperty must be present, but if null the entry is ignored.\n") @Nullable private Object value; @@ -48,9 +33,9 @@ public class AttributeNameValueModel { private AttributeNameValueModel.AttributeType type; /** - * The attribute name. Property is required and must be non-null. + * The attribute name. * - *

    (Required) + *

    Property is required and must be non-null. */ @JsonProperty("name") @Nullable @@ -64,10 +49,11 @@ public AttributeNameValueModel withName(String name) { } /** - * The attribute value. The type of value must match .type. Property must be present, but if null - * the entry is ignored. + * The attribute value. + * + *

    The type of value must match .type. * - *

    (Required) + *

    Property must be present, but if null the entry is ignored. */ @JsonProperty("value") @Nullable @@ -80,6 +66,29 @@ public AttributeNameValueModel withValue(Object value) { return this; } + /** + * The attribute type. + * + *

    Values include: + * + *

    * bool: Boolean attribute value. + * + *

    * bool_array: Boolean array attribute value. + * + *

    * double: Double attribute value. + * + *

    * double_array: Double array attribute value. + * + *

    * int: Integer attribute value. + * + *

    * int_array: Integer array attribute value. + * + *

    * string: String attribute value. + * + *

    * string_array: String array attribute value. + * + *

    If omitted, string is used. + */ @JsonProperty("type") @Nullable public AttributeNameValueModel.AttributeType getType() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/Base2ExponentialBucketHistogramAggregationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/Base2ExponentialBucketHistogramAggregationModel.java index 751b12e361c..146a4ec28da 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/Base2ExponentialBucketHistogramAggregationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/Base2ExponentialBucketHistogramAggregationModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,30 +16,23 @@ @Generated("jsonschema2pojo") public class Base2ExponentialBucketHistogramAggregationModel { - /** Configure the max scale factor. If omitted or null, 20 is used. */ @JsonProperty("max_scale") - @JsonPropertyDescription("Configure the max scale factor.\nIf omitted or null, 20 is used.\n") @Nullable private Integer maxScale; - /** - * Configure the maximum number of buckets in each of the positive and negative ranges, not - * counting the special zero bucket. If omitted or null, 160 is used. - */ @JsonProperty("max_size") - @JsonPropertyDescription( - "Configure the maximum number of buckets in each of the positive and negative ranges, not counting the special zero bucket.\nIf omitted or null, 160 is used.\n") @Nullable private Integer maxSize; - /** Configure whether or not to record min and max. If omitted or null, true is used. */ @JsonProperty("record_min_max") - @JsonPropertyDescription( - "Configure whether or not to record min and max.\nIf omitted or null, true is used.\n") @Nullable private Boolean recordMinMax; - /** Configure the max scale factor. If omitted or null, 20 is used. */ + /** + * Configure the max scale factor. + * + *

    If omitted or null, 20 is used. + */ @JsonProperty("max_scale") @Nullable public Integer getMaxScale() { @@ -54,7 +46,9 @@ public Base2ExponentialBucketHistogramAggregationModel withMaxScale(Integer maxS /** * Configure the maximum number of buckets in each of the positive and negative ranges, not - * counting the special zero bucket. If omitted or null, 160 is used. + * counting the special zero bucket. + * + *

    If omitted or null, 160 is used. */ @JsonProperty("max_size") @Nullable @@ -67,7 +61,11 @@ public Base2ExponentialBucketHistogramAggregationModel withMaxSize(Integer maxSi return this; } - /** Configure whether or not to record min and max. If omitted or null, true is used. */ + /** + * Configure whether or not to record min and max. + * + *

    If omitted or null, true is used. + */ @JsonProperty("record_min_max") @Nullable public Boolean getRecordMinMax() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BatchLogRecordProcessorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BatchLogRecordProcessorModel.java index 86802310312..0ece47b56de 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BatchLogRecordProcessorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BatchLogRecordProcessorModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -23,48 +22,32 @@ @Generated("jsonschema2pojo") public class BatchLogRecordProcessorModel { - /** - * Configure delay interval (in milliseconds) between two consecutive exports. Value must be - * non-negative. If omitted or null, 1000 is used. - */ @JsonProperty("schedule_delay") - @JsonPropertyDescription( - "Configure delay interval (in milliseconds) between two consecutive exports. \nValue must be non-negative.\nIf omitted or null, 1000 is used.\n") @Nullable private Integer scheduleDelay; - /** - * Configure maximum allowed time (in milliseconds) to export data. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 30000 is used. - */ @JsonProperty("export_timeout") - @JsonPropertyDescription( - "Configure maximum allowed time (in milliseconds) to export data. \nValue must be non-negative. A value of 0 indicates no limit (infinity).\nIf omitted or null, 30000 is used.\n") @Nullable private Integer exportTimeout; - /** Configure maximum queue size. Value must be positive. If omitted or null, 2048 is used. */ @JsonProperty("max_queue_size") - @JsonPropertyDescription( - "Configure maximum queue size. Value must be positive.\nIf omitted or null, 2048 is used.\n") @Nullable private Integer maxQueueSize; - /** Configure maximum batch size. Value must be positive. If omitted or null, 512 is used. */ @JsonProperty("max_export_batch_size") - @JsonPropertyDescription( - "Configure maximum batch size. Value must be positive.\nIf omitted or null, 512 is used.\n") @Nullable private Integer maxExportBatchSize; - /** (Required) */ @JsonProperty("exporter") @Nullable private LogRecordExporterModel exporter; /** - * Configure delay interval (in milliseconds) between two consecutive exports. Value must be - * non-negative. If omitted or null, 1000 is used. + * Configure delay interval (in milliseconds) between two consecutive exports. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 1000 is used. */ @JsonProperty("schedule_delay") @Nullable @@ -78,8 +61,11 @@ public BatchLogRecordProcessorModel withScheduleDelay(Integer scheduleDelay) { } /** - * Configure maximum allowed time (in milliseconds) to export data. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 30000 is used. + * Configure maximum allowed time (in milliseconds) to export data. + * + *

    Value must be non-negative. A value of 0 indicates no limit (infinity). + * + *

    If omitted or null, 30000 is used. */ @JsonProperty("export_timeout") @Nullable @@ -92,7 +78,11 @@ public BatchLogRecordProcessorModel withExportTimeout(Integer exportTimeout) { return this; } - /** Configure maximum queue size. Value must be positive. If omitted or null, 2048 is used. */ + /** + * Configure maximum queue size. Value must be positive. + * + *

    If omitted or null, 2048 is used. + */ @JsonProperty("max_queue_size") @Nullable public Integer getMaxQueueSize() { @@ -104,7 +94,11 @@ public BatchLogRecordProcessorModel withMaxQueueSize(Integer maxQueueSize) { return this; } - /** Configure maximum batch size. Value must be positive. If omitted or null, 512 is used. */ + /** + * Configure maximum batch size. Value must be positive. + * + *

    If omitted or null, 512 is used. + */ @JsonProperty("max_export_batch_size") @Nullable public Integer getMaxExportBatchSize() { @@ -116,7 +110,11 @@ public BatchLogRecordProcessorModel withMaxExportBatchSize(Integer maxExportBatc return this; } - /** (Required) */ + /** + * Configure exporter. + * + *

    Property is required and must be non-null. + */ @JsonProperty("exporter") @Nullable public LogRecordExporterModel getExporter() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BatchSpanProcessorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BatchSpanProcessorModel.java index c14f2ab98b8..e46841ca2b6 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BatchSpanProcessorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BatchSpanProcessorModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -23,48 +22,32 @@ @Generated("jsonschema2pojo") public class BatchSpanProcessorModel { - /** - * Configure delay interval (in milliseconds) between two consecutive exports. Value must be - * non-negative. If omitted or null, 5000 is used. - */ @JsonProperty("schedule_delay") - @JsonPropertyDescription( - "Configure delay interval (in milliseconds) between two consecutive exports. \nValue must be non-negative.\nIf omitted or null, 5000 is used.\n") @Nullable private Integer scheduleDelay; - /** - * Configure maximum allowed time (in milliseconds) to export data. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 30000 is used. - */ @JsonProperty("export_timeout") - @JsonPropertyDescription( - "Configure maximum allowed time (in milliseconds) to export data. \nValue must be non-negative. A value of 0 indicates no limit (infinity).\nIf omitted or null, 30000 is used.\n") @Nullable private Integer exportTimeout; - /** Configure maximum queue size. Value must be positive. If omitted or null, 2048 is used. */ @JsonProperty("max_queue_size") - @JsonPropertyDescription( - "Configure maximum queue size. Value must be positive.\nIf omitted or null, 2048 is used.\n") @Nullable private Integer maxQueueSize; - /** Configure maximum batch size. Value must be positive. If omitted or null, 512 is used. */ @JsonProperty("max_export_batch_size") - @JsonPropertyDescription( - "Configure maximum batch size. Value must be positive.\nIf omitted or null, 512 is used.\n") @Nullable private Integer maxExportBatchSize; - /** (Required) */ @JsonProperty("exporter") @Nullable private SpanExporterModel exporter; /** - * Configure delay interval (in milliseconds) between two consecutive exports. Value must be - * non-negative. If omitted or null, 5000 is used. + * Configure delay interval (in milliseconds) between two consecutive exports. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 5000 is used. */ @JsonProperty("schedule_delay") @Nullable @@ -78,8 +61,11 @@ public BatchSpanProcessorModel withScheduleDelay(Integer scheduleDelay) { } /** - * Configure maximum allowed time (in milliseconds) to export data. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 30000 is used. + * Configure maximum allowed time (in milliseconds) to export data. + * + *

    Value must be non-negative. A value of 0 indicates no limit (infinity). + * + *

    If omitted or null, 30000 is used. */ @JsonProperty("export_timeout") @Nullable @@ -92,7 +78,11 @@ public BatchSpanProcessorModel withExportTimeout(Integer exportTimeout) { return this; } - /** Configure maximum queue size. Value must be positive. If omitted or null, 2048 is used. */ + /** + * Configure maximum queue size. Value must be positive. + * + *

    If omitted or null, 2048 is used. + */ @JsonProperty("max_queue_size") @Nullable public Integer getMaxQueueSize() { @@ -104,7 +94,11 @@ public BatchSpanProcessorModel withMaxQueueSize(Integer maxQueueSize) { return this; } - /** Configure maximum batch size. Value must be positive. If omitted or null, 512 is used. */ + /** + * Configure maximum batch size. Value must be positive. + * + *

    If omitted or null, 512 is used. + */ @JsonProperty("max_export_batch_size") @Nullable public Integer getMaxExportBatchSize() { @@ -116,7 +110,11 @@ public BatchSpanProcessorModel withMaxExportBatchSize(Integer maxExportBatchSize return this; } - /** (Required) */ + /** + * Configure exporter. + * + *

    Property is required and must be non-null. + */ @JsonProperty("exporter") @Nullable public SpanExporterModel getExporter() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/CardinalityLimitsModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/CardinalityLimitsModel.java index 43bfb74aae2..23bc545213a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/CardinalityLimitsModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/CardinalityLimitsModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -26,89 +25,44 @@ @Generated("jsonschema2pojo") public class CardinalityLimitsModel { - /** - * Configure default cardinality limit for all instrument types. Instrument-specific cardinality - * limits take priority. If omitted or null, 2000 is used. - */ @JsonProperty("default") - @JsonPropertyDescription( - "Configure default cardinality limit for all instrument types.\nInstrument-specific cardinality limits take priority.\nIf omitted or null, 2000 is used.\n") @Nullable private Integer _default; - /** - * Configure default cardinality limit for counter instruments. If omitted or null, the value from - * .default is used. - */ @JsonProperty("counter") - @JsonPropertyDescription( - "Configure default cardinality limit for counter instruments.\nIf omitted or null, the value from .default is used.\n") @Nullable private Integer counter; - /** - * Configure default cardinality limit for gauge instruments. If omitted or null, the value from - * .default is used. - */ @JsonProperty("gauge") - @JsonPropertyDescription( - "Configure default cardinality limit for gauge instruments.\nIf omitted or null, the value from .default is used.\n") @Nullable private Integer gauge; - /** - * Configure default cardinality limit for histogram instruments. If omitted or null, the value - * from .default is used. - */ @JsonProperty("histogram") - @JsonPropertyDescription( - "Configure default cardinality limit for histogram instruments.\nIf omitted or null, the value from .default is used.\n") @Nullable private Integer histogram; - /** - * Configure default cardinality limit for observable_counter instruments. If omitted or null, the - * value from .default is used. - */ @JsonProperty("observable_counter") - @JsonPropertyDescription( - "Configure default cardinality limit for observable_counter instruments.\nIf omitted or null, the value from .default is used.\n") @Nullable private Integer observableCounter; - /** - * Configure default cardinality limit for observable_gauge instruments. If omitted or null, the - * value from .default is used. - */ @JsonProperty("observable_gauge") - @JsonPropertyDescription( - "Configure default cardinality limit for observable_gauge instruments.\nIf omitted or null, the value from .default is used.\n") @Nullable private Integer observableGauge; - /** - * Configure default cardinality limit for observable_up_down_counter instruments. If omitted or - * null, the value from .default is used. - */ @JsonProperty("observable_up_down_counter") - @JsonPropertyDescription( - "Configure default cardinality limit for observable_up_down_counter instruments.\nIf omitted or null, the value from .default is used.\n") @Nullable private Integer observableUpDownCounter; - /** - * Configure default cardinality limit for up_down_counter instruments. If omitted or null, the - * value from .default is used. - */ @JsonProperty("up_down_counter") - @JsonPropertyDescription( - "Configure default cardinality limit for up_down_counter instruments.\nIf omitted or null, the value from .default is used.\n") @Nullable private Integer upDownCounter; /** - * Configure default cardinality limit for all instrument types. Instrument-specific cardinality - * limits take priority. If omitted or null, 2000 is used. + * Configure default cardinality limit for all instrument types. + * + *

    Instrument-specific cardinality limits take priority. + * + *

    If omitted or null, 2000 is used. */ @JsonProperty("default") @Nullable @@ -122,8 +76,9 @@ public CardinalityLimitsModel withDefault(Integer _default) { } /** - * Configure default cardinality limit for counter instruments. If omitted or null, the value from - * .default is used. + * Configure default cardinality limit for counter instruments. + * + *

    If omitted or null, the value from .default is used. */ @JsonProperty("counter") @Nullable @@ -137,8 +92,9 @@ public CardinalityLimitsModel withCounter(Integer counter) { } /** - * Configure default cardinality limit for gauge instruments. If omitted or null, the value from - * .default is used. + * Configure default cardinality limit for gauge instruments. + * + *

    If omitted or null, the value from .default is used. */ @JsonProperty("gauge") @Nullable @@ -152,8 +108,9 @@ public CardinalityLimitsModel withGauge(Integer gauge) { } /** - * Configure default cardinality limit for histogram instruments. If omitted or null, the value - * from .default is used. + * Configure default cardinality limit for histogram instruments. + * + *

    If omitted or null, the value from .default is used. */ @JsonProperty("histogram") @Nullable @@ -167,8 +124,9 @@ public CardinalityLimitsModel withHistogram(Integer histogram) { } /** - * Configure default cardinality limit for observable_counter instruments. If omitted or null, the - * value from .default is used. + * Configure default cardinality limit for observable_counter instruments. + * + *

    If omitted or null, the value from .default is used. */ @JsonProperty("observable_counter") @Nullable @@ -182,8 +140,9 @@ public CardinalityLimitsModel withObservableCounter(Integer observableCounter) { } /** - * Configure default cardinality limit for observable_gauge instruments. If omitted or null, the - * value from .default is used. + * Configure default cardinality limit for observable_gauge instruments. + * + *

    If omitted or null, the value from .default is used. */ @JsonProperty("observable_gauge") @Nullable @@ -197,8 +156,9 @@ public CardinalityLimitsModel withObservableGauge(Integer observableGauge) { } /** - * Configure default cardinality limit for observable_up_down_counter instruments. If omitted or - * null, the value from .default is used. + * Configure default cardinality limit for observable_up_down_counter instruments. + * + *

    If omitted or null, the value from .default is used. */ @JsonProperty("observable_up_down_counter") @Nullable @@ -212,8 +172,9 @@ public CardinalityLimitsModel withObservableUpDownCounter(Integer observableUpDo } /** - * Configure default cardinality limit for up_down_counter instruments. If omitted or null, the - * value from .default is used. + * Configure default cardinality limit for up_down_counter instruments. + * + *

    If omitted or null, the value from .default is used. */ @JsonProperty("up_down_counter") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ConsoleMetricExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ConsoleMetricExporterModel.java index ac732bc0ad2..b18df479a99 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ConsoleMetricExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ConsoleMetricExporterModel.java @@ -25,6 +25,21 @@ public class ConsoleMetricExporterModel { private OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation defaultHistogramAggregation; + /** + * Configure temporality preference. + * + *

    Values include: + * + *

    * cumulative: Use cumulative aggregation temporality for all instrument types. + * + *

    * delta: Use delta aggregation for all instrument types except up down counter and + * asynchronous up down counter. + * + *

    * low_memory: Use delta aggregation temporality for counter and histogram instrument types. + * Use cumulative aggregation temporality for all other instrument types. + * + *

    If omitted, cumulative is used. + */ @JsonProperty("temporality_preference") @Nullable public OtlpHttpMetricExporterModel.ExporterTemporalityPreference getTemporalityPreference() { @@ -37,6 +52,19 @@ public ConsoleMetricExporterModel withTemporalityPreference( return this; } + /** + * Configure default histogram aggregation. + * + *

    Values include: + * + *

    * base2_exponential_bucket_histogram: Use base2 exponential histogram as the default + * aggregation for histogram instruments. + * + *

    * explicit_bucket_histogram: Use explicit bucket histogram as the default aggregation for + * histogram instruments. + * + *

    If omitted, explicit_bucket_histogram is used. + */ @JsonProperty("default_histogram_aggregation") @Nullable public OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExplicitBucketHistogramAggregationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExplicitBucketHistogramAggregationModel.java index e6a986d3325..295f7a84ea1 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExplicitBucketHistogramAggregationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExplicitBucketHistogramAggregationModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,25 +17,19 @@ @Generated("jsonschema2pojo") public class ExplicitBucketHistogramAggregationModel { - /** - * Configure bucket boundaries. If omitted, [0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, - * 5000, 7500, 10000] is used. - */ @JsonProperty("boundaries") - @JsonPropertyDescription( - "Configure bucket boundaries.\nIf omitted, [0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000] is used.\n") @Nullable private List boundaries; - /** Configure record min and max. If omitted or null, true is used. */ @JsonProperty("record_min_max") - @JsonPropertyDescription("Configure record min and max.\nIf omitted or null, true is used.\n") @Nullable private Boolean recordMinMax; /** - * Configure bucket boundaries. If omitted, [0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, - * 5000, 7500, 10000] is used. + * Configure bucket boundaries. + * + *

    If omitted, [0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000] is + * used. */ @JsonProperty("boundaries") @Nullable @@ -49,7 +42,11 @@ public ExplicitBucketHistogramAggregationModel withBoundaries(List bound return this; } - /** Configure record min and max. If omitted or null, true is used. */ + /** + * Configure record min and max. + * + *

    If omitted or null, true is used. + */ @JsonProperty("record_min_max") @Nullable public Boolean getRecordMinMax() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/GrpcTlsModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/GrpcTlsModel.java index 20ccc58c50a..6d3d8d06d31 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/GrpcTlsModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/GrpcTlsModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,52 +16,28 @@ @Generated("jsonschema2pojo") public class GrpcTlsModel { - /** - * Configure certificate used to verify a server's TLS credentials. Absolute path to certificate - * file in PEM format. If omitted or null, system default certificate verification is used for - * secure connections. - */ @JsonProperty("ca_file") - @JsonPropertyDescription( - "Configure certificate used to verify a server's TLS credentials. \nAbsolute path to certificate file in PEM format.\nIf omitted or null, system default certificate verification is used for secure connections.\n") @Nullable private String caFile; - /** - * Configure mTLS private client key. Absolute path to client key file in PEM format. If set, - * .client_certificate must also be set. If omitted or null, mTLS is not used. - */ @JsonProperty("key_file") - @JsonPropertyDescription( - "Configure mTLS private client key. \nAbsolute path to client key file in PEM format. If set, .client_certificate must also be set.\nIf omitted or null, mTLS is not used.\n") @Nullable private String keyFile; - /** - * Configure mTLS client certificate. Absolute path to client certificate file in PEM format. If - * set, .client_key must also be set. If omitted or null, mTLS is not used. - */ @JsonProperty("cert_file") - @JsonPropertyDescription( - "Configure mTLS client certificate. \nAbsolute path to client certificate file in PEM format. If set, .client_key must also be set.\nIf omitted or null, mTLS is not used.\n") @Nullable private String certFile; - /** - * Configure client transport security for the exporter's connection. Only applicable when - * .endpoint is provided without http or https scheme. Implementations may choose to ignore - * .insecure. If omitted or null, false is used. - */ @JsonProperty("insecure") - @JsonPropertyDescription( - "Configure client transport security for the exporter's connection. \nOnly applicable when .endpoint is provided without http or https scheme. Implementations may choose to ignore .insecure.\nIf omitted or null, false is used.\n") @Nullable private Boolean insecure; /** - * Configure certificate used to verify a server's TLS credentials. Absolute path to certificate - * file in PEM format. If omitted or null, system default certificate verification is used for - * secure connections. + * Configure certificate used to verify a server's TLS credentials. + * + *

    Absolute path to certificate file in PEM format. + * + *

    If omitted or null, system default certificate verification is used for secure connections. */ @JsonProperty("ca_file") @Nullable @@ -76,8 +51,12 @@ public GrpcTlsModel withCaFile(String caFile) { } /** - * Configure mTLS private client key. Absolute path to client key file in PEM format. If set, - * .client_certificate must also be set. If omitted or null, mTLS is not used. + * Configure mTLS private client key. + * + *

    Absolute path to client key file in PEM format. If set, .client_certificate must also be + * set. + * + *

    If omitted or null, mTLS is not used. */ @JsonProperty("key_file") @Nullable @@ -91,8 +70,12 @@ public GrpcTlsModel withKeyFile(String keyFile) { } /** - * Configure mTLS client certificate. Absolute path to client certificate file in PEM format. If - * set, .client_key must also be set. If omitted or null, mTLS is not used. + * Configure mTLS client certificate. + * + *

    Absolute path to client certificate file in PEM format. If set, .client_key must also be + * set. + * + *

    If omitted or null, mTLS is not used. */ @JsonProperty("cert_file") @Nullable @@ -106,9 +89,12 @@ public GrpcTlsModel withCertFile(String certFile) { } /** - * Configure client transport security for the exporter's connection. Only applicable when - * .endpoint is provided without http or https scheme. Implementations may choose to ignore - * .insecure. If omitted or null, false is used. + * Configure client transport security for the exporter's connection. + * + *

    Only applicable when .endpoint is provided without http or https scheme. Implementations may + * choose to ignore .insecure. + * + *

    If omitted or null, false is used. */ @JsonProperty("insecure") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/HttpTlsModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/HttpTlsModel.java index ffdd25de9dc..bd73d88739c 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/HttpTlsModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/HttpTlsModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,41 +16,24 @@ @Generated("jsonschema2pojo") public class HttpTlsModel { - /** - * Configure certificate used to verify a server's TLS credentials. Absolute path to certificate - * file in PEM format. If omitted or null, system default certificate verification is used for - * secure connections. - */ @JsonProperty("ca_file") - @JsonPropertyDescription( - "Configure certificate used to verify a server's TLS credentials. \nAbsolute path to certificate file in PEM format.\nIf omitted or null, system default certificate verification is used for secure connections.\n") @Nullable private String caFile; - /** - * Configure mTLS private client key. Absolute path to client key file in PEM format. If set, - * .client_certificate must also be set. If omitted or null, mTLS is not used. - */ @JsonProperty("key_file") - @JsonPropertyDescription( - "Configure mTLS private client key. \nAbsolute path to client key file in PEM format. If set, .client_certificate must also be set.\nIf omitted or null, mTLS is not used.\n") @Nullable private String keyFile; - /** - * Configure mTLS client certificate. Absolute path to client certificate file in PEM format. If - * set, .client_key must also be set. If omitted or null, mTLS is not used. - */ @JsonProperty("cert_file") - @JsonPropertyDescription( - "Configure mTLS client certificate. \nAbsolute path to client certificate file in PEM format. If set, .client_key must also be set.\nIf omitted or null, mTLS is not used.\n") @Nullable private String certFile; /** - * Configure certificate used to verify a server's TLS credentials. Absolute path to certificate - * file in PEM format. If omitted or null, system default certificate verification is used for - * secure connections. + * Configure certificate used to verify a server's TLS credentials. + * + *

    Absolute path to certificate file in PEM format. + * + *

    If omitted or null, system default certificate verification is used for secure connections. */ @JsonProperty("ca_file") @Nullable @@ -65,8 +47,12 @@ public HttpTlsModel withCaFile(String caFile) { } /** - * Configure mTLS private client key. Absolute path to client key file in PEM format. If set, - * .client_certificate must also be set. If omitted or null, mTLS is not used. + * Configure mTLS private client key. + * + *

    Absolute path to client key file in PEM format. If set, .client_certificate must also be + * set. + * + *

    If omitted or null, mTLS is not used. */ @JsonProperty("key_file") @Nullable @@ -80,8 +66,12 @@ public HttpTlsModel withKeyFile(String keyFile) { } /** - * Configure mTLS client certificate. Absolute path to client certificate file in PEM format. If - * set, .client_key must also be set. If omitted or null, mTLS is not used. + * Configure mTLS client certificate. + * + *

    Absolute path to client certificate file in PEM format. If set, .client_key must also be + * set. + * + *

    If omitted or null, mTLS is not used. */ @JsonProperty("cert_file") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IdGeneratorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IdGeneratorModel.java index e5355c129bd..e052b2ced65 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IdGeneratorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IdGeneratorModel.java @@ -29,6 +29,11 @@ public class IdGeneratorModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure the ID generator to randomly generate TraceIds and SpanIds (spec default). + * + *

    If omitted, ignore. + */ @JsonProperty("random") @Nullable public RandomIdGeneratorModel getRandom() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IncludeExcludeModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IncludeExcludeModel.java index cc0fae1a0e7..fc03395063a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IncludeExcludeModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IncludeExcludeModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,36 +17,25 @@ @Generated("jsonschema2pojo") public class IncludeExcludeModel { - /** - * Configure list of value patterns to include. Matching is case-sensitive. Values are evaluated - * to match as follows: * If the value exactly matches. * If the value matches the wildcard - * pattern, where '?' matches any single character and '*' matches any number of characters - * including none. If omitted, all values are included. - */ @JsonProperty("included") - @JsonPropertyDescription( - "Configure list of value patterns to include.\nMatching is case-sensitive. Values are evaluated to match as follows:\n * If the value exactly matches.\n * If the value matches the wildcard pattern, where '?' matches any single character and '*' matches any number of characters including none.\nIf omitted, all values are included.\n") @Nullable private List included; - /** - * Configure list of value patterns to exclude. Applies after .included (i.e. excluded has higher - * priority than included). Matching is case-sensitive. Values are evaluated to match as follows: - * * If the value exactly matches. * If the value matches the wildcard pattern, where '?' matches - * any single character and '*' matches any number of characters including none. If omitted, - * .included attributes are included. - */ @JsonProperty("excluded") - @JsonPropertyDescription( - "Configure list of value patterns to exclude. Applies after .included (i.e. excluded has higher priority than included).\nMatching is case-sensitive. Values are evaluated to match as follows:\n * If the value exactly matches.\n * If the value matches the wildcard pattern, where '?' matches any single character and '*' matches any number of characters including none.\nIf omitted, .included attributes are included.\n") @Nullable private List excluded; /** - * Configure list of value patterns to include. Matching is case-sensitive. Values are evaluated - * to match as follows: * If the value exactly matches. * If the value matches the wildcard - * pattern, where '?' matches any single character and '*' matches any number of characters - * including none. If omitted, all values are included. + * Configure list of value patterns to include. + * + *

    Matching is case-sensitive. Values are evaluated to match as follows: + * + *

    * If the value exactly matches. + * + *

    * If the value matches the wildcard pattern, where '?' matches any single character and '*' + * matches any number of characters including none. + * + *

    If omitted, all values are included. */ @JsonProperty("included") @Nullable @@ -62,10 +50,16 @@ public IncludeExcludeModel withIncluded(List included) { /** * Configure list of value patterns to exclude. Applies after .included (i.e. excluded has higher - * priority than included). Matching is case-sensitive. Values are evaluated to match as follows: - * * If the value exactly matches. * If the value matches the wildcard pattern, where '?' matches - * any single character and '*' matches any number of characters including none. If omitted, - * .included attributes are included. + * priority than included). + * + *

    Matching is case-sensitive. Values are evaluated to match as follows: + * + *

    * If the value exactly matches. + * + *

    * If the value matches the wildcard pattern, where '?' matches any single character and '*' + * matches any number of characters including none. + * + *

    If omitted, .included attributes are included. */ @JsonProperty("excluded") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordExporterModel.java index 3876bdda17b..e5e2fa6dc58 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordExporterModel.java @@ -42,6 +42,11 @@ public class LogRecordExporterModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure exporter to be OTLP with HTTP transport. + * + *

    If omitted, ignore. + */ @JsonProperty("otlp_http") @Nullable public OtlpHttpExporterModel getOtlpHttp() { @@ -53,6 +58,11 @@ public LogRecordExporterModel withOtlpHttp(OtlpHttpExporterModel otlpHttp) { return this; } + /** + * Configure exporter to be OTLP with gRPC transport. + * + *

    If omitted, ignore. + */ @JsonProperty("otlp_grpc") @Nullable public OtlpGrpcExporterModel getOtlpGrpc() { @@ -64,6 +74,11 @@ public LogRecordExporterModel withOtlpGrpc(OtlpGrpcExporterModel otlpGrpc) { return this; } + /** + * Configure exporter to be OTLP with file transport. + * + *

    If omitted, ignore. + */ @JsonProperty("otlp_file/development") @Nullable public ExperimentalOtlpFileExporterModel getOtlpFileDevelopment() { @@ -76,6 +91,11 @@ public LogRecordExporterModel withOtlpFileDevelopment( return this; } + /** + * Configure exporter to be console. + * + *

    If omitted, ignore. + */ @JsonProperty("console") @Nullable public ConsoleExporterModel getConsole() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordLimitsModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordLimitsModel.java index ceefd7800b8..a13450dced2 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordLimitsModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordLimitsModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,29 +16,20 @@ @Generated("jsonschema2pojo") public class LogRecordLimitsModel { - /** - * Configure max attribute value size. Overrides .attribute_limits.attribute_value_length_limit. - * Value must be non-negative. If omitted or null, there is no limit. - */ @JsonProperty("attribute_value_length_limit") - @JsonPropertyDescription( - "Configure max attribute value size. Overrides .attribute_limits.attribute_value_length_limit. \nValue must be non-negative.\nIf omitted or null, there is no limit.\n") @Nullable private Integer attributeValueLengthLimit; - /** - * Configure max attribute count. Overrides .attribute_limits.attribute_count_limit. Value must be - * non-negative. If omitted or null, 128 is used. - */ @JsonProperty("attribute_count_limit") - @JsonPropertyDescription( - "Configure max attribute count. Overrides .attribute_limits.attribute_count_limit. \nValue must be non-negative.\nIf omitted or null, 128 is used.\n") @Nullable private Integer attributeCountLimit; /** * Configure max attribute value size. Overrides .attribute_limits.attribute_value_length_limit. - * Value must be non-negative. If omitted or null, there is no limit. + * + *

    Value must be non-negative. + * + *

    If omitted or null, there is no limit. */ @JsonProperty("attribute_value_length_limit") @Nullable @@ -53,8 +43,11 @@ public LogRecordLimitsModel withAttributeValueLengthLimit(Integer attributeValue } /** - * Configure max attribute count. Overrides .attribute_limits.attribute_count_limit. Value must be - * non-negative. If omitted or null, 128 is used. + * Configure max attribute count. Overrides .attribute_limits.attribute_count_limit. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 128 is used. */ @JsonProperty("attribute_count_limit") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordProcessorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordProcessorModel.java index e3541ee0148..c722118c11f 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordProcessorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordProcessorModel.java @@ -39,6 +39,11 @@ public class LogRecordProcessorModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure a batch log record processor. + * + *

    If omitted, ignore. + */ @JsonProperty("batch") @Nullable public BatchLogRecordProcessorModel getBatch() { @@ -50,6 +55,11 @@ public LogRecordProcessorModel withBatch(BatchLogRecordProcessorModel batch) { return this; } + /** + * Configure a simple log record processor. + * + *

    If omitted, ignore. + */ @JsonProperty("simple") @Nullable public SimpleLogRecordProcessorModel getSimple() { @@ -61,6 +71,11 @@ public LogRecordProcessorModel withSimple(SimpleLogRecordProcessorModel simple) return this; } + /** + * Configure an event to span event bridge log record processor. + * + *

    If omitted, ignore. + */ @JsonProperty("event_to_span_event_bridge/development") @Nullable public ExperimentalEventToSpanEventBridgeLogRecordProcessorModel diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LoggerProviderModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LoggerProviderModel.java index dd95789b55d..108a4995e11 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LoggerProviderModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LoggerProviderModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLoggerConfiguratorModel; import java.util.List; @@ -19,14 +18,7 @@ @Generated("jsonschema2pojo") public class LoggerProviderModel { - /** - * Configure log record processors. Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("processors") - @JsonPropertyDescription( - "Configure log record processors.\nProperty is required and must be non-null.\n") @Nullable private List processors; @@ -39,9 +31,9 @@ public class LoggerProviderModel { private ExperimentalLoggerConfiguratorModel loggerConfiguratorDevelopment; /** - * Configure log record processors. Property is required and must be non-null. + * Configure log record processors. * - *

    (Required) + *

    Property is required and must be non-null. */ @JsonProperty("processors") @Nullable @@ -54,6 +46,11 @@ public LoggerProviderModel withProcessors(List processo return this; } + /** + * Configure log record limits. See also attribute_limits. + * + *

    If omitted, default values as described in LogRecordLimits are used. + */ @JsonProperty("limits") @Nullable public LogRecordLimitsModel getLimits() { @@ -65,6 +62,11 @@ public LoggerProviderModel withLimits(LogRecordLimitsModel limits) { return this; } + /** + * Configure loggers. + * + *

    If omitted, all loggers use default values as described in ExperimentalLoggerConfig. + */ @JsonProperty("logger_configurator/development") @Nullable public ExperimentalLoggerConfiguratorModel getLoggerConfiguratorDevelopment() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MeterProviderModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MeterProviderModel.java index 6f65bcadce2..81c2499f5e8 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MeterProviderModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MeterProviderModel.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonValue; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalMeterConfiguratorModel; @@ -23,24 +22,11 @@ @Generated("jsonschema2pojo") public class MeterProviderModel { - /** - * Configure metric readers. Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("readers") - @JsonPropertyDescription( - "Configure metric readers.\nProperty is required and must be non-null.\n") @Nullable private List readers; - /** - * Configure views. Each view has a selector which determines the instrument(s) it applies to, and - * a configuration for the resulting stream(s). If omitted, no views are registered. - */ @JsonProperty("views") - @JsonPropertyDescription( - "Configure views. \nEach view has a selector which determines the instrument(s) it applies to, and a configuration for the resulting stream(s).\nIf omitted, no views are registered.\n") @Nullable private List views; @@ -53,9 +39,9 @@ public class MeterProviderModel { private ExperimentalMeterConfiguratorModel meterConfiguratorDevelopment; /** - * Configure metric readers. Property is required and must be non-null. + * Configure metric readers. * - *

    (Required) + *

    Property is required and must be non-null. */ @JsonProperty("readers") @Nullable @@ -69,8 +55,12 @@ public MeterProviderModel withReaders(List readers) { } /** - * Configure views. Each view has a selector which determines the instrument(s) it applies to, and - * a configuration for the resulting stream(s). If omitted, no views are registered. + * Configure views. + * + *

    Each view has a selector which determines the instrument(s) it applies to, and a + * configuration for the resulting stream(s). + * + *

    If omitted, no views are registered. */ @JsonProperty("views") @Nullable @@ -83,6 +73,20 @@ public MeterProviderModel withViews(List views) { return this; } + /** + * Configure the exemplar filter. + * + *

    Values include: + * + *

    * always_off: ExemplarFilter which makes no measurements eligible for being an Exemplar. + * + *

    * always_on: ExemplarFilter which makes all measurements eligible for being an Exemplar. + * + *

    * trace_based: ExemplarFilter which makes measurements recorded in the context of a sampled + * parent span eligible for being an Exemplar. + * + *

    If omitted, trace_based is used. + */ @JsonProperty("exemplar_filter") @Nullable public MeterProviderModel.ExemplarFilter getExemplarFilter() { @@ -94,6 +98,11 @@ public MeterProviderModel withExemplarFilter(MeterProviderModel.ExemplarFilter e return this; } + /** + * Configure meters. + * + *

    If omitted, all meters use default values as described in ExperimentalMeterConfig. + */ @JsonProperty("meter_configurator/development") @Nullable public ExperimentalMeterConfiguratorModel getMeterConfiguratorDevelopment() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricProducerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricProducerModel.java index 8eab190eb25..5f28b3394c2 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricProducerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricProducerModel.java @@ -29,6 +29,11 @@ public class MetricProducerModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure metric producer to be opencensus. + * + *

    If omitted, ignore. + */ @JsonProperty("opencensus") @Nullable public OpenCensusMetricProducerModel getOpencensus() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricReaderModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricReaderModel.java index 31169e116a2..770f5ffa4ba 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricReaderModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricReaderModel.java @@ -24,6 +24,11 @@ public class MetricReaderModel { @Nullable private PullMetricReaderModel pull; + /** + * Configure a periodic metric reader. + * + *

    If omitted, ignore. + */ @JsonProperty("periodic") @Nullable public PeriodicMetricReaderModel getPeriodic() { @@ -35,6 +40,11 @@ public MetricReaderModel withPeriodic(PeriodicMetricReaderModel periodic) { return this; } + /** + * Configure a pull based metric reader. + * + *

    If omitted, ignore. + */ @JsonProperty("pull") @Nullable public PullMetricReaderModel getPull() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/NameStringValuePairModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/NameStringValuePairModel.java index b84a731a5fe..58ff9d00feb 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/NameStringValuePairModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/NameStringValuePairModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,32 +16,18 @@ @Generated("jsonschema2pojo") public class NameStringValuePairModel { - /** - * The name of the pair. Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("name") - @JsonPropertyDescription("The name of the pair.\nProperty is required and must be non-null.\n") @Nullable private String name; - /** - * The value of the pair. Property must be present, but if null the behavior is dependent on usage - * context. - * - *

    (Required) - */ @JsonProperty("value") - @JsonPropertyDescription( - "The value of the pair.\nProperty must be present, but if null the behavior is dependent on usage context.\n") @Nullable private String value; /** - * The name of the pair. Property is required and must be non-null. + * The name of the pair. * - *

    (Required) + *

    Property is required and must be non-null. */ @JsonProperty("name") @Nullable @@ -56,10 +41,9 @@ public NameStringValuePairModel withName(String name) { } /** - * The value of the pair. Property must be present, but if null the behavior is dependent on usage - * context. + * The value of the pair. * - *

    (Required) + *

    Property must be present, but if null the behavior is dependent on usage context. */ @JsonProperty("value") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OpenTelemetryConfigurationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OpenTelemetryConfigurationModel.java index e6c7b33fe24..05a206b8f44 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OpenTelemetryConfigurationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OpenTelemetryConfigurationModel.java @@ -11,7 +11,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonValue; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalInstrumentationModel; @@ -43,27 +42,11 @@ @Generated("jsonschema2pojo") public class OpenTelemetryConfigurationModel { - /** - * The file format version. Represented as a string including the semver major, minor version - * numbers (and optionally the meta tag). For example: "0.4", "1.0-rc.2", "1.0" (after stable - * release). See - * https://github.com/open-telemetry/opentelemetry-configuration/blob/main/VERSIONING.md for more - * details. The yaml format is documented at - * https://github.com/open-telemetry/opentelemetry-configuration/tree/main/schema Property is - * required and must be non-null. - * - *

    (Required) - */ @JsonProperty("file_format") - @JsonPropertyDescription( - "The file format version.\nRepresented as a string including the semver major, minor version numbers (and optionally the meta tag). For example: \"0.4\", \"1.0-rc.2\", \"1.0\" (after stable release).\nSee https://github.com/open-telemetry/opentelemetry-configuration/blob/main/VERSIONING.md for more details.\nThe yaml format is documented at https://github.com/open-telemetry/opentelemetry-configuration/tree/main/schema\nProperty is required and must be non-null.\n") @Nullable private String fileFormat; - /** Configure if the SDK is disabled or not. If omitted or null, false is used. */ @JsonProperty("disabled") - @JsonPropertyDescription( - "Configure if the SDK is disabled or not.\nIf omitted or null, false is used.\n") @Nullable private Boolean disabled; @@ -107,15 +90,18 @@ public class OpenTelemetryConfigurationModel { private Map additionalProperties = new LinkedHashMap(); /** - * The file format version. Represented as a string including the semver major, minor version - * numbers (and optionally the meta tag). For example: "0.4", "1.0-rc.2", "1.0" (after stable - * release). See - * https://github.com/open-telemetry/opentelemetry-configuration/blob/main/VERSIONING.md for more - * details. The yaml format is documented at - * https://github.com/open-telemetry/opentelemetry-configuration/tree/main/schema Property is - * required and must be non-null. - * - *

    (Required) + * The file format version. + * + *

    Represented as a string including the semver major, minor version numbers (and optionally + * the meta tag). For example: "0.4", "1.0-rc.2", "1.0" (after stable release). + * + *

    See https://github.com/open-telemetry/opentelemetry-configuration/blob/main/VERSIONING.md + * for more details. + * + *

    The yaml format is documented at + * https://github.com/open-telemetry/opentelemetry-configuration/tree/main/schema + * + *

    Property is required and must be non-null. */ @JsonProperty("file_format") @Nullable @@ -128,7 +114,11 @@ public OpenTelemetryConfigurationModel withFileFormat(String fileFormat) { return this; } - /** Configure if the SDK is disabled or not. If omitted or null, false is used. */ + /** + * Configure if the SDK is disabled or not. + * + *

    If omitted or null, false is used. + */ @JsonProperty("disabled") @Nullable public Boolean getDisabled() { @@ -140,6 +130,61 @@ public OpenTelemetryConfigurationModel withDisabled(Boolean disabled) { return this; } + /** + * Configure the log level of the internal logger used by the SDK. + * + *

    Values include: + * + *

    * debug: debug, severity number 5. + * + *

    * debug2: debug2, severity number 6. + * + *

    * debug3: debug3, severity number 7. + * + *

    * debug4: debug4, severity number 8. + * + *

    * error: error, severity number 17. + * + *

    * error2: error2, severity number 18. + * + *

    * error3: error3, severity number 19. + * + *

    * error4: error4, severity number 20. + * + *

    * fatal: fatal, severity number 21. + * + *

    * fatal2: fatal2, severity number 22. + * + *

    * fatal3: fatal3, severity number 23. + * + *

    * fatal4: fatal4, severity number 24. + * + *

    * info: info, severity number 9. + * + *

    * info2: info2, severity number 10. + * + *

    * info3: info3, severity number 11. + * + *

    * info4: info4, severity number 12. + * + *

    * trace: trace, severity number 1. + * + *

    * trace2: trace2, severity number 2. + * + *

    * trace3: trace3, severity number 3. + * + *

    * trace4: trace4, severity number 4. + * + *

    * warn: warn, severity number 13. + * + *

    * warn2: warn2, severity number 14. + * + *

    * warn3: warn3, severity number 15. + * + *

    * warn4: warn4, severity number 16. + * + *

    If omitted, INFO is used. + */ @JsonProperty("log_level") @Nullable public OpenTelemetryConfigurationModel.SeverityNumber getLogLevel() { @@ -152,6 +197,11 @@ public OpenTelemetryConfigurationModel withLogLevel( return this; } + /** + * Configure general attribute limits. See also tracer_provider.limits, logger_provider.limits. + * + *

    If omitted, default values as described in AttributeLimits are used. + */ @JsonProperty("attribute_limits") @Nullable public AttributeLimitsModel getAttributeLimits() { @@ -163,6 +213,11 @@ public OpenTelemetryConfigurationModel withAttributeLimits(AttributeLimitsModel return this; } + /** + * Configure logger provider. + * + *

    If omitted, a noop logger provider is used. + */ @JsonProperty("logger_provider") @Nullable public LoggerProviderModel getLoggerProvider() { @@ -174,6 +229,11 @@ public OpenTelemetryConfigurationModel withLoggerProvider(LoggerProviderModel lo return this; } + /** + * Configure meter provider. + * + *

    If omitted, a noop meter provider is used. + */ @JsonProperty("meter_provider") @Nullable public MeterProviderModel getMeterProvider() { @@ -185,6 +245,11 @@ public OpenTelemetryConfigurationModel withMeterProvider(MeterProviderModel mete return this; } + /** + * Configure text map context propagators. + * + *

    If omitted, a noop propagator is used. + */ @JsonProperty("propagator") @Nullable public PropagatorModel getPropagator() { @@ -196,6 +261,11 @@ public OpenTelemetryConfigurationModel withPropagator(PropagatorModel propagator return this; } + /** + * Configure tracer provider. + * + *

    If omitted, a noop tracer provider is used. + */ @JsonProperty("tracer_provider") @Nullable public TracerProviderModel getTracerProvider() { @@ -207,6 +277,11 @@ public OpenTelemetryConfigurationModel withTracerProvider(TracerProviderModel tr return this; } + /** + * Configure resource for all signals. + * + *

    If omitted, the default resource is used. + */ @JsonProperty("resource") @Nullable public ResourceModel getResource() { @@ -218,6 +293,11 @@ public OpenTelemetryConfigurationModel withResource(ResourceModel resource) { return this; } + /** + * Configure instrumentation. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("instrumentation/development") @Nullable public ExperimentalInstrumentationModel getInstrumentationDevelopment() { @@ -230,6 +310,17 @@ public OpenTelemetryConfigurationModel withInstrumentationDevelopment( return this; } + /** + * Defines configuration parameters specific to a particular OpenTelemetry distribution or vendor. + * + *

    This section provides a standardized location for distribution-specific settings + * + *

    that are not part of the OpenTelemetry configuration model. + * + *

    It allows vendors to expose their own extensions and general configuration options. + * + *

    If omitted, distribution defaults are used. + */ @JsonProperty("distribution") @Nullable public DistributionModel getDistribution() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpGrpcExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpGrpcExporterModel.java index ec719c24715..71fb128a65e 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpGrpcExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpGrpcExporterModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,10 +17,7 @@ @Generated("jsonschema2pojo") public class OtlpGrpcExporterModel { - /** Configure endpoint. If omitted or null, http://localhost:4317 is used. */ @JsonProperty("endpoint") - @JsonPropertyDescription( - "Configure endpoint.\nIf omitted or null, http://localhost:4317 is used.\n") @Nullable private String endpoint; @@ -29,49 +25,27 @@ public class OtlpGrpcExporterModel { @Nullable private GrpcTlsModel tls; - /** - * Configure headers. Entries have higher priority than entries from .headers_list. If an entry's - * .value is null, the entry is ignored. If omitted, no headers are added. - */ @JsonProperty("headers") - @JsonPropertyDescription( - "Configure headers. Entries have higher priority than entries from .headers_list.\nIf an entry's .value is null, the entry is ignored.\nIf omitted, no headers are added.\n") @Nullable private List headers; - /** - * Configure headers. Entries have lower priority than entries from .headers. The value is a list - * of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See - * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options - * for details. If omitted or null, no headers are added. - */ @JsonProperty("headers_list") - @JsonPropertyDescription( - "Configure headers. Entries have lower priority than entries from .headers.\nThe value is a list of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options for details.\nIf omitted or null, no headers are added.\n") @Nullable private String headersList; - /** - * Configure compression. Known values include: gzip, none. Implementations may support other - * compression algorithms. If omitted or null, none is used. - */ @JsonProperty("compression") - @JsonPropertyDescription( - "Configure compression.\nKnown values include: gzip, none. Implementations may support other compression algorithms.\nIf omitted or null, none is used.\n") @Nullable private String compression; - /** - * Configure max time (in milliseconds) to wait for each export. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 10000 is used. - */ @JsonProperty("timeout") - @JsonPropertyDescription( - "Configure max time (in milliseconds) to wait for each export.\nValue must be non-negative. A value of 0 indicates no limit (infinity).\nIf omitted or null, 10000 is used.\n") @Nullable private Integer timeout; - /** Configure endpoint. If omitted or null, http://localhost:4317 is used. */ + /** + * Configure endpoint. + * + *

    If omitted or null, http://localhost:4317 is used. + */ @JsonProperty("endpoint") @Nullable public String getEndpoint() { @@ -83,6 +57,11 @@ public OtlpGrpcExporterModel withEndpoint(String endpoint) { return this; } + /** + * Configure TLS settings for the exporter. + * + *

    If omitted, system default TLS settings are used. + */ @JsonProperty("tls") @Nullable public GrpcTlsModel getTls() { @@ -95,8 +74,11 @@ public OtlpGrpcExporterModel withTls(GrpcTlsModel tls) { } /** - * Configure headers. Entries have higher priority than entries from .headers_list. If an entry's - * .value is null, the entry is ignored. If omitted, no headers are added. + * Configure headers. Entries have higher priority than entries from .headers_list. + * + *

    If an entry's .value is null, the entry is ignored. + * + *

    If omitted, no headers are added. */ @JsonProperty("headers") @Nullable @@ -110,10 +92,14 @@ public OtlpGrpcExporterModel withHeaders(List headers) } /** - * Configure headers. Entries have lower priority than entries from .headers. The value is a list - * of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See + * Configure headers. Entries have lower priority than entries from .headers. + * + *

    The value is a list of comma separated key-value pairs matching the format of + * OTEL_EXPORTER_OTLP_HEADERS. See * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options - * for details. If omitted or null, no headers are added. + * for details. + * + *

    If omitted or null, no headers are added. */ @JsonProperty("headers_list") @Nullable @@ -127,8 +113,11 @@ public OtlpGrpcExporterModel withHeadersList(String headersList) { } /** - * Configure compression. Known values include: gzip, none. Implementations may support other - * compression algorithms. If omitted or null, none is used. + * Configure compression. + * + *

    Known values include: gzip, none. Implementations may support other compression algorithms. + * + *

    If omitted or null, none is used. */ @JsonProperty("compression") @Nullable @@ -142,8 +131,11 @@ public OtlpGrpcExporterModel withCompression(String compression) { } /** - * Configure max time (in milliseconds) to wait for each export. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 10000 is used. + * Configure max time (in milliseconds) to wait for each export. + * + *

    Value must be non-negative. A value of 0 indicates no limit (infinity). + * + *

    If omitted or null, 10000 is used. */ @JsonProperty("timeout") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpGrpcMetricExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpGrpcMetricExporterModel.java index cfd353e2c04..d8d11fa3f2d 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpGrpcMetricExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpGrpcMetricExporterModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -27,10 +26,7 @@ @Generated("jsonschema2pojo") public class OtlpGrpcMetricExporterModel { - /** Configure endpoint. If omitted or null, http://localhost:4317 is used. */ @JsonProperty("endpoint") - @JsonPropertyDescription( - "Configure endpoint.\nIf omitted or null, http://localhost:4317 is used.\n") @Nullable private String endpoint; @@ -38,45 +34,19 @@ public class OtlpGrpcMetricExporterModel { @Nullable private GrpcTlsModel tls; - /** - * Configure headers. Entries have higher priority than entries from .headers_list. If an entry's - * .value is null, the entry is ignored. If omitted, no headers are added. - */ @JsonProperty("headers") - @JsonPropertyDescription( - "Configure headers. Entries have higher priority than entries from .headers_list.\nIf an entry's .value is null, the entry is ignored.\nIf omitted, no headers are added.\n") @Nullable private List headers; - /** - * Configure headers. Entries have lower priority than entries from .headers. The value is a list - * of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See - * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options - * for details. If omitted or null, no headers are added. - */ @JsonProperty("headers_list") - @JsonPropertyDescription( - "Configure headers. Entries have lower priority than entries from .headers.\nThe value is a list of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options for details.\nIf omitted or null, no headers are added.\n") @Nullable private String headersList; - /** - * Configure compression. Known values include: gzip, none. Implementations may support other - * compression algorithms. If omitted or null, none is used. - */ @JsonProperty("compression") - @JsonPropertyDescription( - "Configure compression.\nKnown values include: gzip, none. Implementations may support other compression algorithms.\nIf omitted or null, none is used.\n") @Nullable private String compression; - /** - * Configure max time (in milliseconds) to wait for each export. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 10000 is used. - */ @JsonProperty("timeout") - @JsonPropertyDescription( - "Configure max time (in milliseconds) to wait for each export.\nValue must be non-negative. A value of 0 indicates no limit (infinity).\nIf omitted or null, 10000 is used.\n") @Nullable private Integer timeout; @@ -89,7 +59,11 @@ public class OtlpGrpcMetricExporterModel { private OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation defaultHistogramAggregation; - /** Configure endpoint. If omitted or null, http://localhost:4317 is used. */ + /** + * Configure endpoint. + * + *

    If omitted or null, http://localhost:4317 is used. + */ @JsonProperty("endpoint") @Nullable public String getEndpoint() { @@ -101,6 +75,11 @@ public OtlpGrpcMetricExporterModel withEndpoint(String endpoint) { return this; } + /** + * Configure TLS settings for the exporter. + * + *

    If omitted, system default TLS settings are used. + */ @JsonProperty("tls") @Nullable public GrpcTlsModel getTls() { @@ -113,8 +92,11 @@ public OtlpGrpcMetricExporterModel withTls(GrpcTlsModel tls) { } /** - * Configure headers. Entries have higher priority than entries from .headers_list. If an entry's - * .value is null, the entry is ignored. If omitted, no headers are added. + * Configure headers. Entries have higher priority than entries from .headers_list. + * + *

    If an entry's .value is null, the entry is ignored. + * + *

    If omitted, no headers are added. */ @JsonProperty("headers") @Nullable @@ -128,10 +110,14 @@ public OtlpGrpcMetricExporterModel withHeaders(List he } /** - * Configure headers. Entries have lower priority than entries from .headers. The value is a list - * of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See + * Configure headers. Entries have lower priority than entries from .headers. + * + *

    The value is a list of comma separated key-value pairs matching the format of + * OTEL_EXPORTER_OTLP_HEADERS. See * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options - * for details. If omitted or null, no headers are added. + * for details. + * + *

    If omitted or null, no headers are added. */ @JsonProperty("headers_list") @Nullable @@ -145,8 +131,11 @@ public OtlpGrpcMetricExporterModel withHeadersList(String headersList) { } /** - * Configure compression. Known values include: gzip, none. Implementations may support other - * compression algorithms. If omitted or null, none is used. + * Configure compression. + * + *

    Known values include: gzip, none. Implementations may support other compression algorithms. + * + *

    If omitted or null, none is used. */ @JsonProperty("compression") @Nullable @@ -160,8 +149,11 @@ public OtlpGrpcMetricExporterModel withCompression(String compression) { } /** - * Configure max time (in milliseconds) to wait for each export. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 10000 is used. + * Configure max time (in milliseconds) to wait for each export. + * + *

    Value must be non-negative. A value of 0 indicates no limit (infinity). + * + *

    If omitted or null, 10000 is used. */ @JsonProperty("timeout") @Nullable @@ -174,6 +166,21 @@ public OtlpGrpcMetricExporterModel withTimeout(Integer timeout) { return this; } + /** + * Configure temporality preference. + * + *

    Values include: + * + *

    * cumulative: Use cumulative aggregation temporality for all instrument types. + * + *

    * delta: Use delta aggregation for all instrument types except up down counter and + * asynchronous up down counter. + * + *

    * low_memory: Use delta aggregation temporality for counter and histogram instrument types. + * Use cumulative aggregation temporality for all other instrument types. + * + *

    If omitted, cumulative is used. + */ @JsonProperty("temporality_preference") @Nullable public OtlpHttpMetricExporterModel.ExporterTemporalityPreference getTemporalityPreference() { @@ -186,6 +193,19 @@ public OtlpGrpcMetricExporterModel withTemporalityPreference( return this; } + /** + * Configure default histogram aggregation. + * + *

    Values include: + * + *

    * base2_exponential_bucket_histogram: Use base2 exponential histogram as the default + * aggregation for histogram instruments. + * + *

    * explicit_bucket_histogram: Use explicit bucket histogram as the default aggregation for + * histogram instruments. + * + *

    If omitted, explicit_bucket_histogram is used. + */ @JsonProperty("default_histogram_aggregation") @Nullable public OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpExporterModel.java index 622a413df12..ad842b1fce9 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpExporterModel.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; @@ -30,13 +29,7 @@ @Generated("jsonschema2pojo") public class OtlpHttpExporterModel { - /** - * Configure endpoint, including the signal specific path. If omitted or null, the - * http://localhost:4318/v1/{signal} (where signal is 'traces', 'logs', or 'metrics') is used. - */ @JsonProperty("endpoint") - @JsonPropertyDescription( - "Configure endpoint, including the signal specific path.\nIf omitted or null, the http://localhost:4318/v1/{signal} (where signal is 'traces', 'logs', or 'metrics') is used.\n") @Nullable private String endpoint; @@ -44,45 +37,19 @@ public class OtlpHttpExporterModel { @Nullable private HttpTlsModel tls; - /** - * Configure headers. Entries have higher priority than entries from .headers_list. If an entry's - * .value is null, the entry is ignored. If omitted, no headers are added. - */ @JsonProperty("headers") - @JsonPropertyDescription( - "Configure headers. Entries have higher priority than entries from .headers_list.\nIf an entry's .value is null, the entry is ignored.\nIf omitted, no headers are added.\n") @Nullable private List headers; - /** - * Configure headers. Entries have lower priority than entries from .headers. The value is a list - * of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See - * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options - * for details. If omitted or null, no headers are added. - */ @JsonProperty("headers_list") - @JsonPropertyDescription( - "Configure headers. Entries have lower priority than entries from .headers.\nThe value is a list of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options for details.\nIf omitted or null, no headers are added.\n") @Nullable private String headersList; - /** - * Configure compression. Known values include: gzip, none. Implementations may support other - * compression algorithms. If omitted or null, none is used. - */ @JsonProperty("compression") - @JsonPropertyDescription( - "Configure compression.\nKnown values include: gzip, none. Implementations may support other compression algorithms.\nIf omitted or null, none is used.\n") @Nullable private String compression; - /** - * Configure max time (in milliseconds) to wait for each export. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 10000 is used. - */ @JsonProperty("timeout") - @JsonPropertyDescription( - "Configure max time (in milliseconds) to wait for each export.\nValue must be non-negative. A value of 0 indicates no limit (infinity).\nIf omitted or null, 10000 is used.\n") @Nullable private Integer timeout; @@ -91,8 +58,10 @@ public class OtlpHttpExporterModel { private OtlpHttpExporterModel.OtlpHttpEncoding encoding; /** - * Configure endpoint, including the signal specific path. If omitted or null, the - * http://localhost:4318/v1/{signal} (where signal is 'traces', 'logs', or 'metrics') is used. + * Configure endpoint, including the signal specific path. + * + *

    If omitted or null, the http://localhost:4318/v1/{signal} (where signal is 'traces', 'logs', + * or 'metrics') is used. */ @JsonProperty("endpoint") @Nullable @@ -105,6 +74,11 @@ public OtlpHttpExporterModel withEndpoint(String endpoint) { return this; } + /** + * Configure TLS settings for the exporter. + * + *

    If omitted, system default TLS settings are used. + */ @JsonProperty("tls") @Nullable public HttpTlsModel getTls() { @@ -117,8 +91,11 @@ public OtlpHttpExporterModel withTls(HttpTlsModel tls) { } /** - * Configure headers. Entries have higher priority than entries from .headers_list. If an entry's - * .value is null, the entry is ignored. If omitted, no headers are added. + * Configure headers. Entries have higher priority than entries from .headers_list. + * + *

    If an entry's .value is null, the entry is ignored. + * + *

    If omitted, no headers are added. */ @JsonProperty("headers") @Nullable @@ -132,10 +109,14 @@ public OtlpHttpExporterModel withHeaders(List headers) } /** - * Configure headers. Entries have lower priority than entries from .headers. The value is a list - * of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See + * Configure headers. Entries have lower priority than entries from .headers. + * + *

    The value is a list of comma separated key-value pairs matching the format of + * OTEL_EXPORTER_OTLP_HEADERS. See * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options - * for details. If omitted or null, no headers are added. + * for details. + * + *

    If omitted or null, no headers are added. */ @JsonProperty("headers_list") @Nullable @@ -149,8 +130,11 @@ public OtlpHttpExporterModel withHeadersList(String headersList) { } /** - * Configure compression. Known values include: gzip, none. Implementations may support other - * compression algorithms. If omitted or null, none is used. + * Configure compression. + * + *

    Known values include: gzip, none. Implementations may support other compression algorithms. + * + *

    If omitted or null, none is used. */ @JsonProperty("compression") @Nullable @@ -164,8 +148,11 @@ public OtlpHttpExporterModel withCompression(String compression) { } /** - * Configure max time (in milliseconds) to wait for each export. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 10000 is used. + * Configure max time (in milliseconds) to wait for each export. + * + *

    Value must be non-negative. A value of 0 indicates no limit (infinity). + * + *

    If omitted or null, 10000 is used. */ @JsonProperty("timeout") @Nullable @@ -178,6 +165,19 @@ public OtlpHttpExporterModel withTimeout(Integer timeout) { return this; } + /** + * Configure the encoding used for messages. + * + *

    Implementations may not support json. + * + *

    Values include: + * + *

    * json: Protobuf JSON encoding. + * + *

    * protobuf: Protobuf binary encoding. + * + *

    If omitted, protobuf is used. + */ @JsonProperty("encoding") @Nullable public OtlpHttpExporterModel.OtlpHttpEncoding getEncoding() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpMetricExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpMetricExporterModel.java index 740d6ca88c2..a88d0a645dd 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpMetricExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpMetricExporterModel.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; @@ -32,10 +31,7 @@ @Generated("jsonschema2pojo") public class OtlpHttpMetricExporterModel { - /** Configure endpoint. If omitted or null, http://localhost:4318/v1/metrics is used. */ @JsonProperty("endpoint") - @JsonPropertyDescription( - "Configure endpoint.\nIf omitted or null, http://localhost:4318/v1/metrics is used.\n") @Nullable private String endpoint; @@ -43,45 +39,19 @@ public class OtlpHttpMetricExporterModel { @Nullable private HttpTlsModel tls; - /** - * Configure headers. Entries have higher priority than entries from .headers_list. If an entry's - * .value is null, the entry is ignored. If omitted, no headers are added. - */ @JsonProperty("headers") - @JsonPropertyDescription( - "Configure headers. Entries have higher priority than entries from .headers_list.\nIf an entry's .value is null, the entry is ignored.\nIf omitted, no headers are added.\n") @Nullable private List headers; - /** - * Configure headers. Entries have lower priority than entries from .headers. The value is a list - * of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See - * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options - * for details. If omitted or null, no headers are added. - */ @JsonProperty("headers_list") - @JsonPropertyDescription( - "Configure headers. Entries have lower priority than entries from .headers.\nThe value is a list of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options for details.\nIf omitted or null, no headers are added.\n") @Nullable private String headersList; - /** - * Configure compression. Known values include: gzip, none. Implementations may support other - * compression algorithms. If omitted or null, none is used. - */ @JsonProperty("compression") - @JsonPropertyDescription( - "Configure compression.\nKnown values include: gzip, none. Implementations may support other compression algorithms.\nIf omitted or null, none is used.\n") @Nullable private String compression; - /** - * Configure max time (in milliseconds) to wait for each export. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 10000 is used. - */ @JsonProperty("timeout") - @JsonPropertyDescription( - "Configure max time (in milliseconds) to wait for each export.\nValue must be non-negative. A value of 0 indicates no limit (infinity).\nIf omitted or null, 10000 is used.\n") @Nullable private Integer timeout; @@ -98,7 +68,11 @@ public class OtlpHttpMetricExporterModel { private OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation defaultHistogramAggregation; - /** Configure endpoint. If omitted or null, http://localhost:4318/v1/metrics is used. */ + /** + * Configure endpoint. + * + *

    If omitted or null, http://localhost:4318/v1/metrics is used. + */ @JsonProperty("endpoint") @Nullable public String getEndpoint() { @@ -110,6 +84,11 @@ public OtlpHttpMetricExporterModel withEndpoint(String endpoint) { return this; } + /** + * Configure TLS settings for the exporter. + * + *

    If omitted, system default TLS settings are used. + */ @JsonProperty("tls") @Nullable public HttpTlsModel getTls() { @@ -122,8 +101,11 @@ public OtlpHttpMetricExporterModel withTls(HttpTlsModel tls) { } /** - * Configure headers. Entries have higher priority than entries from .headers_list. If an entry's - * .value is null, the entry is ignored. If omitted, no headers are added. + * Configure headers. Entries have higher priority than entries from .headers_list. + * + *

    If an entry's .value is null, the entry is ignored. + * + *

    If omitted, no headers are added. */ @JsonProperty("headers") @Nullable @@ -137,10 +119,14 @@ public OtlpHttpMetricExporterModel withHeaders(List he } /** - * Configure headers. Entries have lower priority than entries from .headers. The value is a list - * of comma separated key-value pairs matching the format of OTEL_EXPORTER_OTLP_HEADERS. See + * Configure headers. Entries have lower priority than entries from .headers. + * + *

    The value is a list of comma separated key-value pairs matching the format of + * OTEL_EXPORTER_OTLP_HEADERS. See * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options - * for details. If omitted or null, no headers are added. + * for details. + * + *

    If omitted or null, no headers are added. */ @JsonProperty("headers_list") @Nullable @@ -154,8 +140,11 @@ public OtlpHttpMetricExporterModel withHeadersList(String headersList) { } /** - * Configure compression. Known values include: gzip, none. Implementations may support other - * compression algorithms. If omitted or null, none is used. + * Configure compression. + * + *

    Known values include: gzip, none. Implementations may support other compression algorithms. + * + *

    If omitted or null, none is used. */ @JsonProperty("compression") @Nullable @@ -169,8 +158,11 @@ public OtlpHttpMetricExporterModel withCompression(String compression) { } /** - * Configure max time (in milliseconds) to wait for each export. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 10000 is used. + * Configure max time (in milliseconds) to wait for each export. + * + *

    Value must be non-negative. A value of 0 indicates no limit (infinity). + * + *

    If omitted or null, 10000 is used. */ @JsonProperty("timeout") @Nullable @@ -183,6 +175,19 @@ public OtlpHttpMetricExporterModel withTimeout(Integer timeout) { return this; } + /** + * Configure the encoding used for messages. + * + *

    Implementations may not support json. + * + *

    Values include: + * + *

    * json: Protobuf JSON encoding. + * + *

    * protobuf: Protobuf binary encoding. + * + *

    If omitted, protobuf is used. + */ @JsonProperty("encoding") @Nullable public OtlpHttpExporterModel.OtlpHttpEncoding getEncoding() { @@ -194,6 +199,21 @@ public OtlpHttpMetricExporterModel withEncoding(OtlpHttpExporterModel.OtlpHttpEn return this; } + /** + * Configure temporality preference. + * + *

    Values include: + * + *

    * cumulative: Use cumulative aggregation temporality for all instrument types. + * + *

    * delta: Use delta aggregation for all instrument types except up down counter and + * asynchronous up down counter. + * + *

    * low_memory: Use delta aggregation temporality for counter and histogram instrument types. + * Use cumulative aggregation temporality for all other instrument types. + * + *

    If omitted, cumulative is used. + */ @JsonProperty("temporality_preference") @Nullable public OtlpHttpMetricExporterModel.ExporterTemporalityPreference getTemporalityPreference() { @@ -206,6 +226,19 @@ public OtlpHttpMetricExporterModel withTemporalityPreference( return this; } + /** + * Configure default histogram aggregation. + * + *

    Values include: + * + *

    * base2_exponential_bucket_histogram: Use base2 exponential histogram as the default + * aggregation for histogram instruments. + * + *

    * explicit_bucket_histogram: Use explicit bucket histogram as the default aggregation for + * histogram instruments. + * + *

    If omitted, explicit_bucket_histogram is used. + */ @JsonProperty("default_histogram_aggregation") @Nullable public OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ParentBasedSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ParentBasedSamplerModel.java index 68c236e91f8..6f8b99791f2 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ParentBasedSamplerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ParentBasedSamplerModel.java @@ -42,6 +42,11 @@ public class ParentBasedSamplerModel { @Nullable private SamplerModel localParentNotSampled; + /** + * Configure root sampler. + * + *

    If omitted, always_on is used. + */ @JsonProperty("root") @Nullable public SamplerModel getRoot() { @@ -53,6 +58,11 @@ public ParentBasedSamplerModel withRoot(SamplerModel root) { return this; } + /** + * Configure remote_parent_sampled sampler. + * + *

    If omitted, always_on is used. + */ @JsonProperty("remote_parent_sampled") @Nullable public SamplerModel getRemoteParentSampled() { @@ -64,6 +74,11 @@ public ParentBasedSamplerModel withRemoteParentSampled(SamplerModel remoteParent return this; } + /** + * Configure remote_parent_not_sampled sampler. + * + *

    If omitted, always_off is used. + */ @JsonProperty("remote_parent_not_sampled") @Nullable public SamplerModel getRemoteParentNotSampled() { @@ -75,6 +90,11 @@ public ParentBasedSamplerModel withRemoteParentNotSampled(SamplerModel remotePar return this; } + /** + * Configure local_parent_sampled sampler. + * + *

    If omitted, always_on is used. + */ @JsonProperty("local_parent_sampled") @Nullable public SamplerModel getLocalParentSampled() { @@ -86,6 +106,11 @@ public ParentBasedSamplerModel withLocalParentSampled(SamplerModel localParentSa return this; } + /** + * Configure local_parent_not_sampled sampler. + * + *

    If omitted, always_off is used. + */ @JsonProperty("local_parent_not_sampled") @Nullable public SamplerModel getLocalParentNotSampled() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PeriodicMetricReaderModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PeriodicMetricReaderModel.java index 79780bd61cb..1e348059920 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PeriodicMetricReaderModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PeriodicMetricReaderModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -25,42 +24,23 @@ @Generated("jsonschema2pojo") public class PeriodicMetricReaderModel { - /** - * Configure delay interval (in milliseconds) between start of two consecutive exports. Value must - * be non-negative. If omitted or null, 60000 is used. - */ @JsonProperty("interval") - @JsonPropertyDescription( - "Configure delay interval (in milliseconds) between start of two consecutive exports. \nValue must be non-negative.\nIf omitted or null, 60000 is used.\n") @Nullable private Integer interval; - /** - * Configure maximum allowed time (in milliseconds) to export data. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 30000 is used. - */ @JsonProperty("timeout") - @JsonPropertyDescription( - "Configure maximum allowed time (in milliseconds) to export data. \nValue must be non-negative. A value of 0 indicates no limit (infinity).\nIf omitted or null, 30000 is used.\n") @Nullable private Integer timeout; - /** Configure maximum export batch size. If omitted or null, no limit is used. */ @JsonProperty("max_export_batch_size/development") - @JsonPropertyDescription( - "Configure maximum export batch size.\nIf omitted or null, no limit is used.\n") @Nullable private Integer maxExportBatchSizeDevelopment; - /** (Required) */ @JsonProperty("exporter") @Nullable private PushMetricExporterModel exporter; - /** Configure metric producers. If omitted, no metric producers are added. */ @JsonProperty("producers") - @JsonPropertyDescription( - "Configure metric producers.\nIf omitted, no metric producers are added.\n") @Nullable private List producers; @@ -69,8 +49,11 @@ public class PeriodicMetricReaderModel { private CardinalityLimitsModel cardinalityLimits; /** - * Configure delay interval (in milliseconds) between start of two consecutive exports. Value must - * be non-negative. If omitted or null, 60000 is used. + * Configure delay interval (in milliseconds) between start of two consecutive exports. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 60000 is used. */ @JsonProperty("interval") @Nullable @@ -84,8 +67,11 @@ public PeriodicMetricReaderModel withInterval(Integer interval) { } /** - * Configure maximum allowed time (in milliseconds) to export data. Value must be non-negative. A - * value of 0 indicates no limit (infinity). If omitted or null, 30000 is used. + * Configure maximum allowed time (in milliseconds) to export data. + * + *

    Value must be non-negative. A value of 0 indicates no limit (infinity). + * + *

    If omitted or null, 30000 is used. */ @JsonProperty("timeout") @Nullable @@ -98,7 +84,11 @@ public PeriodicMetricReaderModel withTimeout(Integer timeout) { return this; } - /** Configure maximum export batch size. If omitted or null, no limit is used. */ + /** + * Configure maximum export batch size. + * + *

    If omitted or null, no limit is used. + */ @JsonProperty("max_export_batch_size/development") @Nullable public Integer getMaxExportBatchSizeDevelopment() { @@ -111,7 +101,11 @@ public PeriodicMetricReaderModel withMaxExportBatchSizeDevelopment( return this; } - /** (Required) */ + /** + * Configure exporter. + * + *

    Property is required and must be non-null. + */ @JsonProperty("exporter") @Nullable public PushMetricExporterModel getExporter() { @@ -123,7 +117,11 @@ public PeriodicMetricReaderModel withExporter(PushMetricExporterModel exporter) return this; } - /** Configure metric producers. If omitted, no metric producers are added. */ + /** + * Configure metric producers. + * + *

    If omitted, no metric producers are added. + */ @JsonProperty("producers") @Nullable public List getProducers() { @@ -135,6 +133,11 @@ public PeriodicMetricReaderModel withProducers(List produce return this; } + /** + * Configure cardinality limits. + * + *

    If omitted, default values as described in CardinalityLimits are used. + */ @JsonProperty("cardinality_limits") @Nullable public CardinalityLimitsModel getCardinalityLimits() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PropagatorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PropagatorModel.java index 9ad2cec1ee6..ae608750542 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PropagatorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PropagatorModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,38 +17,22 @@ @Generated("jsonschema2pojo") public class PropagatorModel { - /** - * Configure the propagators in the composite text map propagator. Entries from .composite_list - * are appended to the list here with duplicates filtered out. Built-in propagator keys include: - * tracecontext, baggage, b3, b3multi. Known third party keys include: xray. If omitted, and - * .composite_list is omitted or null, a noop propagator is used. - */ @JsonProperty("composite") - @JsonPropertyDescription( - "Configure the propagators in the composite text map propagator. Entries from .composite_list are appended to the list here with duplicates filtered out.\nBuilt-in propagator keys include: tracecontext, baggage, b3, b3multi. Known third party keys include: xray.\nIf omitted, and .composite_list is omitted or null, a noop propagator is used.\n") @Nullable private List composite; - /** - * Configure the propagators in the composite text map propagator. Entries are appended to - * .composite with duplicates filtered out. The value is a comma separated list of propagator - * identifiers matching the format of OTEL_PROPAGATORS. See - * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration - * for details. Built-in propagator identifiers include: tracecontext, baggage, b3, b3multi. Known - * third party identifiers include: xray. If omitted or null, and .composite is omitted or null, a - * noop propagator is used. - */ @JsonProperty("composite_list") - @JsonPropertyDescription( - "Configure the propagators in the composite text map propagator. Entries are appended to .composite with duplicates filtered out.\nThe value is a comma separated list of propagator identifiers matching the format of OTEL_PROPAGATORS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.\nBuilt-in propagator identifiers include: tracecontext, baggage, b3, b3multi. Known third party identifiers include: xray.\nIf omitted or null, and .composite is omitted or null, a noop propagator is used.\n") @Nullable private String compositeList; /** * Configure the propagators in the composite text map propagator. Entries from .composite_list - * are appended to the list here with duplicates filtered out. Built-in propagator keys include: - * tracecontext, baggage, b3, b3multi. Known third party keys include: xray. If omitted, and - * .composite_list is omitted or null, a noop propagator is used. + * are appended to the list here with duplicates filtered out. + * + *

    Built-in propagator keys include: tracecontext, baggage, b3, b3multi. Known third party keys + * include: xray. + * + *

    If omitted, and .composite_list is omitted or null, a noop propagator is used. */ @JsonProperty("composite") @Nullable @@ -64,12 +47,17 @@ public PropagatorModel withComposite(List composite) { /** * Configure the propagators in the composite text map propagator. Entries are appended to - * .composite with duplicates filtered out. The value is a comma separated list of propagator - * identifiers matching the format of OTEL_PROPAGATORS. See + * .composite with duplicates filtered out. + * + *

    The value is a comma separated list of propagator identifiers matching the format of + * OTEL_PROPAGATORS. See * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration - * for details. Built-in propagator identifiers include: tracecontext, baggage, b3, b3multi. Known - * third party identifiers include: xray. If omitted or null, and .composite is omitted or null, a - * noop propagator is used. + * for details. + * + *

    Built-in propagator identifiers include: tracecontext, baggage, b3, b3multi. Known third + * party identifiers include: xray. + * + *

    If omitted or null, and .composite is omitted or null, a noop propagator is used. */ @JsonProperty("composite_list") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricExporterModel.java index d44a017e3ec..766d58ac277 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricExporterModel.java @@ -30,6 +30,11 @@ public class PullMetricExporterModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure exporter to be prometheus. + * + *

    If omitted, ignore. + */ @JsonProperty("prometheus/development") @Nullable public ExperimentalPrometheusMetricExporterModel getPrometheusDevelopment() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricReaderModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricReaderModel.java index 449e6e5394a..0986b99db09 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricReaderModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricReaderModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,15 +17,11 @@ @Generated("jsonschema2pojo") public class PullMetricReaderModel { - /** (Required) */ @JsonProperty("exporter") @Nullable private PullMetricExporterModel exporter; - /** Configure metric producers. If omitted, no metric producers are added. */ @JsonProperty("producers") - @JsonPropertyDescription( - "Configure metric producers.\nIf omitted, no metric producers are added.\n") @Nullable private List producers; @@ -34,7 +29,11 @@ public class PullMetricReaderModel { @Nullable private CardinalityLimitsModel cardinalityLimits; - /** (Required) */ + /** + * Configure exporter. + * + *

    Property is required and must be non-null. + */ @JsonProperty("exporter") @Nullable public PullMetricExporterModel getExporter() { @@ -46,7 +45,11 @@ public PullMetricReaderModel withExporter(PullMetricExporterModel exporter) { return this; } - /** Configure metric producers. If omitted, no metric producers are added. */ + /** + * Configure metric producers. + * + *

    If omitted, no metric producers are added. + */ @JsonProperty("producers") @Nullable public List getProducers() { @@ -58,6 +61,11 @@ public PullMetricReaderModel withProducers(List producers) return this; } + /** + * Configure cardinality limits. + * + *

    If omitted, default values as described in CardinalityLimits are used. + */ @JsonProperty("cardinality_limits") @Nullable public CardinalityLimitsModel getCardinalityLimits() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PushMetricExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PushMetricExporterModel.java index 9897814d12a..9ada33b85a6 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PushMetricExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PushMetricExporterModel.java @@ -42,6 +42,11 @@ public class PushMetricExporterModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure exporter to be OTLP with HTTP transport. + * + *

    If omitted, ignore. + */ @JsonProperty("otlp_http") @Nullable public OtlpHttpMetricExporterModel getOtlpHttp() { @@ -53,6 +58,11 @@ public PushMetricExporterModel withOtlpHttp(OtlpHttpMetricExporterModel otlpHttp return this; } + /** + * Configure exporter to be OTLP with gRPC transport. + * + *

    If omitted, ignore. + */ @JsonProperty("otlp_grpc") @Nullable public OtlpGrpcMetricExporterModel getOtlpGrpc() { @@ -64,6 +74,11 @@ public PushMetricExporterModel withOtlpGrpc(OtlpGrpcMetricExporterModel otlpGrpc return this; } + /** + * Configure exporter to be OTLP with file transport. + * + *

    If omitted, ignore. + */ @JsonProperty("otlp_file/development") @Nullable public ExperimentalOtlpFileMetricExporterModel getOtlpFileDevelopment() { @@ -76,6 +91,11 @@ public PushMetricExporterModel withOtlpFileDevelopment( return this; } + /** + * Configure exporter to be console. + * + *

    If omitted, ignore. + */ @JsonProperty("console") @Nullable public ConsoleMetricExporterModel getConsole() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ResourceModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ResourceModel.java index c0199b91c3b..17d1299bff1 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ResourceModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ResourceModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectionModel; import java.util.List; @@ -19,13 +18,7 @@ @Generated("jsonschema2pojo") public class ResourceModel { - /** - * Configure resource attributes. Entries have higher priority than entries from - * .resource.attributes_list. If omitted, no resource attributes are added. - */ @JsonProperty("attributes") - @JsonPropertyDescription( - "Configure resource attributes. Entries have higher priority than entries from .resource.attributes_list.\nIf omitted, no resource attributes are added.\n") @Nullable private List attributes; @@ -33,29 +26,19 @@ public class ResourceModel { @Nullable private ExperimentalResourceDetectionModel detectionDevelopment; - /** Configure resource schema URL. If omitted or null, no schema URL is used. */ @JsonProperty("schema_url") - @JsonPropertyDescription( - "Configure resource schema URL.\nIf omitted or null, no schema URL is used.\n") @Nullable private String schemaUrl; - /** - * Configure resource attributes. Entries have lower priority than entries from - * .resource.attributes. The value is a list of comma separated key-value pairs matching the - * format of OTEL_RESOURCE_ATTRIBUTES. See - * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration - * for details. If omitted or null, no resource attributes are added. - */ @JsonProperty("attributes_list") - @JsonPropertyDescription( - "Configure resource attributes. Entries have lower priority than entries from .resource.attributes.\nThe value is a list of comma separated key-value pairs matching the format of OTEL_RESOURCE_ATTRIBUTES. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.\nIf omitted or null, no resource attributes are added.\n") @Nullable private String attributesList; /** * Configure resource attributes. Entries have higher priority than entries from - * .resource.attributes_list. If omitted, no resource attributes are added. + * .resource.attributes_list. + * + *

    If omitted, no resource attributes are added. */ @JsonProperty("attributes") @Nullable @@ -68,6 +51,11 @@ public ResourceModel withAttributes(List attributes) { return this; } + /** + * Configure resource detection. + * + *

    If omitted, resource detection is disabled. + */ @JsonProperty("detection/development") @Nullable public ExperimentalResourceDetectionModel getDetectionDevelopment() { @@ -80,7 +68,11 @@ public ResourceModel withDetectionDevelopment( return this; } - /** Configure resource schema URL. If omitted or null, no schema URL is used. */ + /** + * Configure resource schema URL. + * + *

    If omitted or null, no schema URL is used. + */ @JsonProperty("schema_url") @Nullable public String getSchemaUrl() { @@ -94,10 +86,14 @@ public ResourceModel withSchemaUrl(String schemaUrl) { /** * Configure resource attributes. Entries have lower priority than entries from - * .resource.attributes. The value is a list of comma separated key-value pairs matching the - * format of OTEL_RESOURCE_ATTRIBUTES. See + * .resource.attributes. + * + *

    The value is a list of comma separated key-value pairs matching the format of + * OTEL_RESOURCE_ATTRIBUTES. See * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration - * for details. If omitted or null, no resource attributes are added. + * for details. + * + *

    If omitted or null, no resource attributes are added. */ @JsonProperty("attributes_list") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SamplerModel.java index 9f27b0ff24e..0101c980c64 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SamplerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SamplerModel.java @@ -64,6 +64,11 @@ public class SamplerModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure sampler to be always_off. + * + *

    If omitted, ignore. + */ @JsonProperty("always_off") @Nullable public AlwaysOffSamplerModel getAlwaysOff() { @@ -75,6 +80,11 @@ public SamplerModel withAlwaysOff(AlwaysOffSamplerModel alwaysOff) { return this; } + /** + * Configure sampler to be always_on. + * + *

    If omitted, ignore. + */ @JsonProperty("always_on") @Nullable public AlwaysOnSamplerModel getAlwaysOn() { @@ -86,6 +96,11 @@ public SamplerModel withAlwaysOn(AlwaysOnSamplerModel alwaysOn) { return this; } + /** + * Configure sampler to be composite. + * + *

    If omitted, ignore. + */ @JsonProperty("composite/development") @Nullable public ExperimentalComposableSamplerModel getCompositeDevelopment() { @@ -98,6 +113,11 @@ public SamplerModel withCompositeDevelopment( return this; } + /** + * Configure sampler to be jaeger_remote. + * + *

    If omitted, ignore. + */ @JsonProperty("jaeger_remote/development") @Nullable public ExperimentalJaegerRemoteSamplerModel getJaegerRemoteDevelopment() { @@ -110,6 +130,11 @@ public SamplerModel withJaegerRemoteDevelopment( return this; } + /** + * Configure sampler to be parent_based. + * + *

    If omitted, ignore. + */ @JsonProperty("parent_based") @Nullable public ParentBasedSamplerModel getParentBased() { @@ -121,6 +146,11 @@ public SamplerModel withParentBased(ParentBasedSamplerModel parentBased) { return this; } + /** + * Configure sampler to be probability. + * + *

    If omitted, ignore. + */ @JsonProperty("probability/development") @Nullable public ExperimentalProbabilitySamplerModel getProbabilityDevelopment() { @@ -133,6 +163,11 @@ public SamplerModel withProbabilityDevelopment( return this; } + /** + * Configure sampler to be trace_id_ratio_based. + * + *

    If omitted, ignore. + */ @JsonProperty("trace_id_ratio_based") @Nullable public TraceIdRatioBasedSamplerModel getTraceIdRatioBased() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SimpleLogRecordProcessorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SimpleLogRecordProcessorModel.java index ec424f96279..43d033ab15a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SimpleLogRecordProcessorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SimpleLogRecordProcessorModel.java @@ -16,12 +16,15 @@ @Generated("jsonschema2pojo") public class SimpleLogRecordProcessorModel { - /** (Required) */ @JsonProperty("exporter") @Nullable private LogRecordExporterModel exporter; - /** (Required) */ + /** + * Configure exporter. + * + *

    Property is required and must be non-null. + */ @JsonProperty("exporter") @Nullable public LogRecordExporterModel getExporter() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SimpleSpanProcessorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SimpleSpanProcessorModel.java index e70022c2620..97622a7e238 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SimpleSpanProcessorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SimpleSpanProcessorModel.java @@ -16,12 +16,15 @@ @Generated("jsonschema2pojo") public class SimpleSpanProcessorModel { - /** (Required) */ @JsonProperty("exporter") @Nullable private SpanExporterModel exporter; - /** (Required) */ + /** + * Configure exporter. + * + *

    Property is required and must be non-null. + */ @JsonProperty("exporter") @Nullable public SpanExporterModel getExporter() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanExporterModel.java index bfd34280d61..58245c8be49 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanExporterModel.java @@ -42,6 +42,11 @@ public class SpanExporterModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure exporter to be OTLP with HTTP transport. + * + *

    If omitted, ignore. + */ @JsonProperty("otlp_http") @Nullable public OtlpHttpExporterModel getOtlpHttp() { @@ -53,6 +58,11 @@ public SpanExporterModel withOtlpHttp(OtlpHttpExporterModel otlpHttp) { return this; } + /** + * Configure exporter to be OTLP with gRPC transport. + * + *

    If omitted, ignore. + */ @JsonProperty("otlp_grpc") @Nullable public OtlpGrpcExporterModel getOtlpGrpc() { @@ -64,6 +74,11 @@ public SpanExporterModel withOtlpGrpc(OtlpGrpcExporterModel otlpGrpc) { return this; } + /** + * Configure exporter to be OTLP with file transport. + * + *

    If omitted, ignore. + */ @JsonProperty("otlp_file/development") @Nullable public ExperimentalOtlpFileExporterModel getOtlpFileDevelopment() { @@ -76,6 +91,11 @@ public SpanExporterModel withOtlpFileDevelopment( return this; } + /** + * Configure exporter to be console. + * + *

    If omitted, ignore. + */ @JsonProperty("console") @Nullable public ConsoleExporterModel getConsole() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanLimitsModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanLimitsModel.java index 1d30a7477f9..9b7f8ed8154 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanLimitsModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanLimitsModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -24,65 +23,36 @@ @Generated("jsonschema2pojo") public class SpanLimitsModel { - /** - * Configure max attribute value size. Overrides .attribute_limits.attribute_value_length_limit. - * Value must be non-negative. If omitted or null, there is no limit. - */ @JsonProperty("attribute_value_length_limit") - @JsonPropertyDescription( - "Configure max attribute value size. Overrides .attribute_limits.attribute_value_length_limit. \nValue must be non-negative.\nIf omitted or null, there is no limit.\n") @Nullable private Integer attributeValueLengthLimit; - /** - * Configure max attribute count. Overrides .attribute_limits.attribute_count_limit. Value must be - * non-negative. If omitted or null, 128 is used. - */ @JsonProperty("attribute_count_limit") - @JsonPropertyDescription( - "Configure max attribute count. Overrides .attribute_limits.attribute_count_limit. \nValue must be non-negative.\nIf omitted or null, 128 is used.\n") @Nullable private Integer attributeCountLimit; - /** - * Configure max span event count. Value must be non-negative. If omitted or null, 128 is used. - */ @JsonProperty("event_count_limit") - @JsonPropertyDescription( - "Configure max span event count. \nValue must be non-negative.\nIf omitted or null, 128 is used.\n") @Nullable private Integer eventCountLimit; - /** Configure max span link count. Value must be non-negative. If omitted or null, 128 is used. */ @JsonProperty("link_count_limit") - @JsonPropertyDescription( - "Configure max span link count. \nValue must be non-negative.\nIf omitted or null, 128 is used.\n") @Nullable private Integer linkCountLimit; - /** - * Configure max attributes per span event. Value must be non-negative. If omitted or null, 128 is - * used. - */ @JsonProperty("event_attribute_count_limit") - @JsonPropertyDescription( - "Configure max attributes per span event. \nValue must be non-negative.\nIf omitted or null, 128 is used.\n") @Nullable private Integer eventAttributeCountLimit; - /** - * Configure max attributes per span link. Value must be non-negative. If omitted or null, 128 is - * used. - */ @JsonProperty("link_attribute_count_limit") - @JsonPropertyDescription( - "Configure max attributes per span link. \nValue must be non-negative.\nIf omitted or null, 128 is used.\n") @Nullable private Integer linkAttributeCountLimit; /** * Configure max attribute value size. Overrides .attribute_limits.attribute_value_length_limit. - * Value must be non-negative. If omitted or null, there is no limit. + * + *

    Value must be non-negative. + * + *

    If omitted or null, there is no limit. */ @JsonProperty("attribute_value_length_limit") @Nullable @@ -96,8 +66,11 @@ public SpanLimitsModel withAttributeValueLengthLimit(Integer attributeValueLengt } /** - * Configure max attribute count. Overrides .attribute_limits.attribute_count_limit. Value must be - * non-negative. If omitted or null, 128 is used. + * Configure max attribute count. Overrides .attribute_limits.attribute_count_limit. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 128 is used. */ @JsonProperty("attribute_count_limit") @Nullable @@ -111,7 +84,11 @@ public SpanLimitsModel withAttributeCountLimit(Integer attributeCountLimit) { } /** - * Configure max span event count. Value must be non-negative. If omitted or null, 128 is used. + * Configure max span event count. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 128 is used. */ @JsonProperty("event_count_limit") @Nullable @@ -124,7 +101,13 @@ public SpanLimitsModel withEventCountLimit(Integer eventCountLimit) { return this; } - /** Configure max span link count. Value must be non-negative. If omitted or null, 128 is used. */ + /** + * Configure max span link count. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 128 is used. + */ @JsonProperty("link_count_limit") @Nullable public Integer getLinkCountLimit() { @@ -137,8 +120,11 @@ public SpanLimitsModel withLinkCountLimit(Integer linkCountLimit) { } /** - * Configure max attributes per span event. Value must be non-negative. If omitted or null, 128 is - * used. + * Configure max attributes per span event. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 128 is used. */ @JsonProperty("event_attribute_count_limit") @Nullable @@ -152,8 +138,11 @@ public SpanLimitsModel withEventAttributeCountLimit(Integer eventAttributeCountL } /** - * Configure max attributes per span link. Value must be non-negative. If omitted or null, 128 is - * used. + * Configure max attributes per span link. + * + *

    Value must be non-negative. + * + *

    If omitted or null, 128 is used. */ @JsonProperty("link_attribute_count_limit") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanProcessorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanProcessorModel.java index a2e36a729a9..7fa1c131d4b 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanProcessorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanProcessorModel.java @@ -33,6 +33,11 @@ public class SpanProcessorModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure a batch span processor. + * + *

    If omitted, ignore. + */ @JsonProperty("batch") @Nullable public BatchSpanProcessorModel getBatch() { @@ -44,6 +49,11 @@ public SpanProcessorModel withBatch(BatchSpanProcessorModel batch) { return this; } + /** + * Configure a simple span processor. + * + *

    If omitted, ignore. + */ @JsonProperty("simple") @Nullable public SimpleSpanProcessorModel getSimple() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TextMapPropagatorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TextMapPropagatorModel.java index 1423db0f940..680ea2705f4 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TextMapPropagatorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TextMapPropagatorModel.java @@ -41,6 +41,11 @@ public class TextMapPropagatorModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Include the w3c trace context propagator. + * + *

    If omitted, ignore. + */ @JsonProperty("tracecontext") @Nullable public TraceContextPropagatorModel getTracecontext() { @@ -52,6 +57,11 @@ public TextMapPropagatorModel withTracecontext(TraceContextPropagatorModel trace return this; } + /** + * Include the w3c baggage propagator. + * + *

    If omitted, ignore. + */ @JsonProperty("baggage") @Nullable public BaggagePropagatorModel getBaggage() { @@ -63,6 +73,11 @@ public TextMapPropagatorModel withBaggage(BaggagePropagatorModel baggage) { return this; } + /** + * Include the zipkin b3 propagator. + * + *

    If omitted, ignore. + */ @JsonProperty("b3") @Nullable public B3PropagatorModel getB3() { @@ -74,6 +89,11 @@ public TextMapPropagatorModel withB3(B3PropagatorModel b3) { return this; } + /** + * Include the zipkin b3 multi propagator. + * + *

    If omitted, ignore. + */ @JsonProperty("b3multi") @Nullable public B3MultiPropagatorModel getB3multi() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TraceIdRatioBasedSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TraceIdRatioBasedSamplerModel.java index bf7f376204b..49dc7273b0a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TraceIdRatioBasedSamplerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TraceIdRatioBasedSamplerModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,13 +16,15 @@ @Generated("jsonschema2pojo") public class TraceIdRatioBasedSamplerModel { - /** Configure trace_id_ratio. If omitted or null, 1.0 is used. */ @JsonProperty("ratio") - @JsonPropertyDescription("Configure trace_id_ratio.\nIf omitted or null, 1.0 is used.\n") @Nullable private Double ratio; - /** Configure trace_id_ratio. If omitted or null, 1.0 is used. */ + /** + * Configure trace_id_ratio. + * + *

    If omitted or null, 1.0 is used. + */ @JsonProperty("ratio") @Nullable public Double getRatio() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TracerProviderModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TracerProviderModel.java index 144f625a0d2..680db7966e8 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TracerProviderModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TracerProviderModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalTracerConfiguratorModel; import java.util.List; @@ -25,14 +24,7 @@ @Generated("jsonschema2pojo") public class TracerProviderModel { - /** - * Configure span processors. Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("processors") - @JsonPropertyDescription( - "Configure span processors.\nProperty is required and must be non-null.\n") @Nullable private List processors; @@ -53,9 +45,9 @@ public class TracerProviderModel { private ExperimentalTracerConfiguratorModel tracerConfiguratorDevelopment; /** - * Configure span processors. Property is required and must be non-null. + * Configure span processors. * - *

    (Required) + *

    Property is required and must be non-null. */ @JsonProperty("processors") @Nullable @@ -68,6 +60,11 @@ public TracerProviderModel withProcessors(List processors) { return this; } + /** + * Configure span limits. See also attribute_limits. + * + *

    If omitted, default values as described in SpanLimits are used. + */ @JsonProperty("limits") @Nullable public SpanLimitsModel getLimits() { @@ -79,6 +76,11 @@ public TracerProviderModel withLimits(SpanLimitsModel limits) { return this; } + /** + * Configure the sampler. + * + *

    If omitted, parent based sampler with a root of always_on is used. + */ @JsonProperty("sampler") @Nullable public SamplerModel getSampler() { @@ -90,6 +92,11 @@ public TracerProviderModel withSampler(SamplerModel sampler) { return this; } + /** + * Configure the trace and span ID generator. + * + *

    If omitted, RandomIdGenerator is used. + */ @JsonProperty("id_generator") @Nullable public IdGeneratorModel getIdGenerator() { @@ -101,6 +108,11 @@ public TracerProviderModel withIdGenerator(IdGeneratorModel idGenerator) { return this; } + /** + * Configure tracers. + * + *

    If omitted, all tracers use default values as described in ExperimentalTracerConfig. + */ @JsonProperty("tracer_configurator/development") @Nullable public ExperimentalTracerConfiguratorModel getTracerConfiguratorDevelopment() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewModel.java index 7f4721a789e..c9c462b1278 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewModel.java @@ -16,17 +16,22 @@ @Generated("jsonschema2pojo") public class ViewModel { - /** (Required) */ @JsonProperty("selector") @Nullable private ViewSelectorModel selector; - /** (Required) */ @JsonProperty("stream") @Nullable private ViewStreamModel stream; - /** (Required) */ + /** + * Configure view selector. + * + *

    Selection criteria is additive as described in + * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#instrument-selection-criteria. + * + *

    Property is required and must be non-null. + */ @JsonProperty("selector") @Nullable public ViewSelectorModel getSelector() { @@ -38,7 +43,11 @@ public ViewModel withSelector(ViewSelectorModel selector) { return this; } - /** (Required) */ + /** + * Configure view stream. + * + *

    Property is required and must be non-null. + */ @JsonProperty("stream") @Nullable public ViewStreamModel getStream() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewSelectorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewSelectorModel.java index 080bb0cdc83..cb6664cdbfc 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewSelectorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewSelectorModel.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; @@ -28,12 +27,7 @@ @Generated("jsonschema2pojo") public class ViewSelectorModel { - /** - * Configure instrument name selection criteria. If omitted or null, all instrument names match. - */ @JsonProperty("instrument_name") - @JsonPropertyDescription( - "Configure instrument name selection criteria.\nIf omitted or null, all instrument names match.\n") @Nullable private String instrumentName; @@ -41,41 +35,26 @@ public class ViewSelectorModel { @Nullable private ViewSelectorModel.InstrumentType instrumentType; - /** - * Configure the instrument unit selection criteria. If omitted or null, all instrument units - * match. - */ @JsonProperty("unit") - @JsonPropertyDescription( - "Configure the instrument unit selection criteria.\nIf omitted or null, all instrument units match.\n") @Nullable private String unit; - /** Configure meter name selection criteria. If omitted or null, all meter names match. */ @JsonProperty("meter_name") - @JsonPropertyDescription( - "Configure meter name selection criteria.\nIf omitted or null, all meter names match.\n") @Nullable private String meterName; - /** Configure meter version selection criteria. If omitted or null, all meter versions match. */ @JsonProperty("meter_version") - @JsonPropertyDescription( - "Configure meter version selection criteria.\nIf omitted or null, all meter versions match.\n") @Nullable private String meterVersion; - /** - * Configure meter schema url selection criteria. If omitted or null, all meter schema URLs match. - */ @JsonProperty("meter_schema_url") - @JsonPropertyDescription( - "Configure meter schema url selection criteria.\nIf omitted or null, all meter schema URLs match.\n") @Nullable private String meterSchemaUrl; /** - * Configure instrument name selection criteria. If omitted or null, all instrument names match. + * Configure instrument name selection criteria. + * + *

    If omitted or null, all instrument names match. */ @JsonProperty("instrument_name") @Nullable @@ -88,6 +67,27 @@ public ViewSelectorModel withInstrumentName(String instrumentName) { return this; } + /** + * Configure instrument type selection criteria. + * + *

    Values include: + * + *

    * counter: Synchronous counter instruments. + * + *

    * gauge: Synchronous gauge instruments. + * + *

    * histogram: Synchronous histogram instruments. + * + *

    * observable_counter: Asynchronous counter instruments. + * + *

    * observable_gauge: Asynchronous gauge instruments. + * + *

    * observable_up_down_counter: Asynchronous up down counter instruments. + * + *

    * up_down_counter: Synchronous up down counter instruments. + * + *

    If omitted, all instrument types match. + */ @JsonProperty("instrument_type") @Nullable public ViewSelectorModel.InstrumentType getInstrumentType() { @@ -100,8 +100,9 @@ public ViewSelectorModel withInstrumentType(ViewSelectorModel.InstrumentType ins } /** - * Configure the instrument unit selection criteria. If omitted or null, all instrument units - * match. + * Configure the instrument unit selection criteria. + * + *

    If omitted or null, all instrument units match. */ @JsonProperty("unit") @Nullable @@ -114,7 +115,11 @@ public ViewSelectorModel withUnit(String unit) { return this; } - /** Configure meter name selection criteria. If omitted or null, all meter names match. */ + /** + * Configure meter name selection criteria. + * + *

    If omitted or null, all meter names match. + */ @JsonProperty("meter_name") @Nullable public String getMeterName() { @@ -126,7 +131,11 @@ public ViewSelectorModel withMeterName(String meterName) { return this; } - /** Configure meter version selection criteria. If omitted or null, all meter versions match. */ + /** + * Configure meter version selection criteria. + * + *

    If omitted or null, all meter versions match. + */ @JsonProperty("meter_version") @Nullable public String getMeterVersion() { @@ -139,7 +148,9 @@ public ViewSelectorModel withMeterVersion(String meterVersion) { } /** - * Configure meter schema url selection criteria. If omitted or null, all meter schema URLs match. + * Configure meter schema url selection criteria. + * + *

    If omitted or null, all meter schema URLs match. */ @JsonProperty("meter_schema_url") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewStreamModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewStreamModel.java index 334fe9b08f7..0fc2ecd089b 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewStreamModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ViewStreamModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -23,23 +22,11 @@ @Generated("jsonschema2pojo") public class ViewStreamModel { - /** - * Configure metric name of the resulting stream(s). If omitted or null, the instrument's original - * name is used. - */ @JsonProperty("name") - @JsonPropertyDescription( - "Configure metric name of the resulting stream(s).\nIf omitted or null, the instrument's original name is used.\n") @Nullable private String name; - /** - * Configure metric description of the resulting stream(s). If omitted or null, the instrument's - * origin description is used. - */ @JsonProperty("description") - @JsonPropertyDescription( - "Configure metric description of the resulting stream(s).\nIf omitted or null, the instrument's origin description is used.\n") @Nullable private String description; @@ -47,13 +34,7 @@ public class ViewStreamModel { @Nullable private AggregationModel aggregation; - /** - * Configure the aggregation cardinality limit. If omitted or null, the metric reader's default - * cardinality limit is used. - */ @JsonProperty("aggregation_cardinality_limit") - @JsonPropertyDescription( - "Configure the aggregation cardinality limit.\nIf omitted or null, the metric reader's default cardinality limit is used.\n") @Nullable private Integer aggregationCardinalityLimit; @@ -62,8 +43,9 @@ public class ViewStreamModel { private IncludeExcludeModel attributeKeys; /** - * Configure metric name of the resulting stream(s). If omitted or null, the instrument's original - * name is used. + * Configure metric name of the resulting stream(s). + * + *

    If omitted or null, the instrument's original name is used. */ @JsonProperty("name") @Nullable @@ -77,8 +59,9 @@ public ViewStreamModel withName(String name) { } /** - * Configure metric description of the resulting stream(s). If omitted or null, the instrument's - * origin description is used. + * Configure metric description of the resulting stream(s). + * + *

    If omitted or null, the instrument's origin description is used. */ @JsonProperty("description") @Nullable @@ -91,6 +74,11 @@ public ViewStreamModel withDescription(String description) { return this; } + /** + * Configure aggregation of the resulting stream(s). + * + *

    If omitted, default is used. + */ @JsonProperty("aggregation") @Nullable public AggregationModel getAggregation() { @@ -103,8 +91,9 @@ public ViewStreamModel withAggregation(AggregationModel aggregation) { } /** - * Configure the aggregation cardinality limit. If omitted or null, the metric reader's default - * cardinality limit is used. + * Configure the aggregation cardinality limit. + * + *

    If omitted or null, the metric reader's default cardinality limit is used. */ @JsonProperty("aggregation_cardinality_limit") @Nullable @@ -117,6 +106,11 @@ public ViewStreamModel withAggregationCardinalityLimit(Integer aggregationCardin return this; } + /** + * Configure attribute keys retained in the resulting stream(s). + * + *

    If omitted, all attribute keys are retained. + */ @JsonProperty("attribute_keys") @Nullable public IncludeExcludeModel getAttributeKeys() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalCodeInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalCodeInstrumentationModel.java index 5044f0f80b6..138e43050f7 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalCodeInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalCodeInstrumentationModel.java @@ -20,6 +20,18 @@ public class ExperimentalCodeInstrumentationModel { @Nullable private ExperimentalSemconvConfigModel semconv; + /** + * Configure code semantic convention version and migration behavior. + * + *

    This property takes precedence over the + * .instrumentation/development.general.stability_opt_in_list setting. + * + *

    See code semantic conventions: + * https://opentelemetry.io/docs/specs/semconv/registry/attributes/code/ + * + *

    If omitted, uses the general stability_opt_in_list setting, or instrumentations continue + * emitting their default semantic convention version if not set. + */ @JsonProperty("semconv") @Nullable public ExperimentalSemconvConfigModel getSemconv() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableParentThresholdSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableParentThresholdSamplerModel.java index 78262383992..64d6041d1fa 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableParentThresholdSamplerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableParentThresholdSamplerModel.java @@ -16,12 +16,15 @@ @Generated("jsonschema2pojo") public class ExperimentalComposableParentThresholdSamplerModel { - /** (Required) */ @JsonProperty("root") @Nullable private ExperimentalComposableSamplerModel root; - /** (Required) */ + /** + * Sampler to use when there is no parent. + * + *

    Property is required and must be non-null. + */ @JsonProperty("root") @Nullable public ExperimentalComposableSamplerModel getRoot() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableProbabilitySamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableProbabilitySamplerModel.java index f291e25952c..c0035f40173 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableProbabilitySamplerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableProbabilitySamplerModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,13 +16,15 @@ @Generated("jsonschema2pojo") public class ExperimentalComposableProbabilitySamplerModel { - /** Configure ratio. If omitted or null, 1.0 is used. */ @JsonProperty("ratio") - @JsonPropertyDescription("Configure ratio.\nIf omitted or null, 1.0 is used.\n") @Nullable private Double ratio; - /** Configure ratio. If omitted or null, 1.0 is used. */ + /** + * Configure ratio. + * + *

    If omitted or null, 1.0 is used. + */ @JsonProperty("ratio") @Nullable public Double getRatio() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerModel.java index a18d958168b..1cf30e21472 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,23 +17,21 @@ @Generated("jsonschema2pojo") public class ExperimentalComposableRuleBasedSamplerModel { - /** - * The rules for the sampler, matched in order. Each rule can have multiple match conditions. All - * conditions must match for the rule to match. If no conditions are specified, the rule matches - * all spans that reach it. If no rules match, the span is not sampled. If omitted, no span is - * sampled. - */ @JsonProperty("rules") - @JsonPropertyDescription( - "The rules for the sampler, matched in order.\nEach rule can have multiple match conditions. All conditions must match for the rule to match.\nIf no conditions are specified, the rule matches all spans that reach it.\nIf no rules match, the span is not sampled.\nIf omitted, no span is sampled.\n") @Nullable private List rules; /** - * The rules for the sampler, matched in order. Each rule can have multiple match conditions. All - * conditions must match for the rule to match. If no conditions are specified, the rule matches - * all spans that reach it. If no rules match, the span is not sampled. If omitted, no span is - * sampled. + * The rules for the sampler, matched in order. + * + *

    Each rule can have multiple match conditions. All conditions must match for the rule to + * match. + * + *

    If no conditions are specified, the rule matches all spans that reach it. + * + *

    If no rules match, the span is not sampled. + * + *

    If omitted, no span is sampled. */ @JsonProperty("rules") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel.java index 8d716df21e3..a6bfc797fa1 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,46 +17,22 @@ @Generated("jsonschema2pojo") public class ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel { - /** - * The attribute key to match against. Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("key") - @JsonPropertyDescription( - "The attribute key to match against.\nProperty is required and must be non-null.\n") @Nullable private String key; - /** - * Configure list of value patterns to include. Matching is case-sensitive. Values are evaluated - * to match as follows: * If the value exactly matches. * If the value matches the wildcard - * pattern, where '?' matches any single character and '*' matches any number of characters - * including none. If omitted, all values are included. - */ @JsonProperty("included") - @JsonPropertyDescription( - "Configure list of value patterns to include.\nMatching is case-sensitive. Values are evaluated to match as follows:\n * If the value exactly matches.\n * If the value matches the wildcard pattern, where '?' matches any single character and '*' matches any number of characters including none.\nIf omitted, all values are included.\n") @Nullable private List included; - /** - * Configure list of value patterns to exclude. Applies after .included (i.e. excluded has higher - * priority than included). Matching is case-sensitive. Values are evaluated to match as follows: - * * If the value exactly matches. * If the value matches the wildcard pattern, where '?' matches - * any single character and '*' matches any number of characters including none. If omitted, - * .included attributes are included. - */ @JsonProperty("excluded") - @JsonPropertyDescription( - "Configure list of value patterns to exclude. Applies after .included (i.e. excluded has higher priority than included).\nMatching is case-sensitive. Values are evaluated to match as follows:\n * If the value exactly matches.\n * If the value matches the wildcard pattern, where '?' matches any single character and '*' matches any number of characters including none.\nIf omitted, .included attributes are included.\n") @Nullable private List excluded; /** - * The attribute key to match against. Property is required and must be non-null. + * The attribute key to match against. * - *

    (Required) + *

    Property is required and must be non-null. */ @JsonProperty("key") @Nullable @@ -71,10 +46,16 @@ public ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel withKey( } /** - * Configure list of value patterns to include. Matching is case-sensitive. Values are evaluated - * to match as follows: * If the value exactly matches. * If the value matches the wildcard - * pattern, where '?' matches any single character and '*' matches any number of characters - * including none. If omitted, all values are included. + * Configure list of value patterns to include. + * + *

    Matching is case-sensitive. Values are evaluated to match as follows: + * + *

    * If the value exactly matches. + * + *

    * If the value matches the wildcard pattern, where '?' matches any single character and '*' + * matches any number of characters including none. + * + *

    If omitted, all values are included. */ @JsonProperty("included") @Nullable @@ -90,10 +71,16 @@ public ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel withIncl /** * Configure list of value patterns to exclude. Applies after .included (i.e. excluded has higher - * priority than included). Matching is case-sensitive. Values are evaluated to match as follows: - * * If the value exactly matches. * If the value matches the wildcard pattern, where '?' matches - * any single character and '*' matches any number of characters including none. If omitted, - * .included attributes are included. + * priority than included). + * + *

    Matching is case-sensitive. Values are evaluated to match as follows: + * + *

    * If the value exactly matches. + * + *

    * If the value matches the wildcard pattern, where '?' matches any single character and '*' + * matches any number of characters including none. + * + *

    If omitted, .included attributes are included. */ @JsonProperty("excluded") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel.java index 314cd681da6..95ff1455737 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,33 +17,18 @@ @Generated("jsonschema2pojo") public class ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel { - /** - * The attribute key to match against. Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("key") - @JsonPropertyDescription( - "The attribute key to match against.\nProperty is required and must be non-null.\n") @Nullable private String key; - /** - * The attribute values to match against. If the attribute's value matches any of these, it - * matches. Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("values") - @JsonPropertyDescription( - "The attribute values to match against. If the attribute's value matches any of these, it matches.\nProperty is required and must be non-null.\n") @Nullable private List values; /** - * The attribute key to match against. Property is required and must be non-null. + * The attribute key to match against. * - *

    (Required) + *

    Property is required and must be non-null. */ @JsonProperty("key") @Nullable @@ -59,9 +43,9 @@ public ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel withKey(St /** * The attribute values to match against. If the attribute's value matches any of these, it - * matches. Property is required and must be non-null. + * matches. * - *

    (Required) + *

    Property is required and must be non-null. */ @JsonProperty("values") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleModel.java index 9e868707707..655781c4b03 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableRuleBasedSamplerRuleModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanKind; import java.util.List; @@ -32,33 +31,29 @@ public class ExperimentalComposableRuleBasedSamplerRuleModel { @Nullable private ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel attributePatterns; - /** - * The span kinds to match. If the span's kind matches any of these, it matches. Values include: * - * client: client, a client span. * consumer: consumer, a consumer span. * internal: internal, an - * internal span. * producer: producer, a producer span. * server: server, a server span. If - * omitted, ignore. - */ @JsonProperty("span_kinds") - @JsonPropertyDescription( - "The span kinds to match. If the span's kind matches any of these, it matches.\nValues include:\n* client: client, a client span.\n* consumer: consumer, a consumer span.\n* internal: internal, an internal span.\n* producer: producer, a producer span.\n* server: server, a server span.\nIf omitted, ignore.\n") @Nullable private List spanKinds; - /** - * The parent span types to match. Values include: * local: local, a local parent. * none: none, - * no parent, i.e., the trace root. * remote: remote, a remote parent. If omitted, ignore. - */ @JsonProperty("parent") - @JsonPropertyDescription( - "The parent span types to match.\nValues include:\n* local: local, a local parent.\n* none: none, no parent, i.e., the trace root.\n* remote: remote, a remote parent.\nIf omitted, ignore.\n") @Nullable private List parent; - /** (Required) */ @JsonProperty("sampler") @Nullable private ExperimentalComposableSamplerModel sampler; + /** + * Values to match against a single attribute. Non-string attributes are matched using their + * string representation: + * + *

    for example, a value of "404" would match the http.response.status_code 404. For array + * attributes, if any + * + *

    item matches, it is considered a match. + * + *

    If omitted, ignore. + */ @JsonProperty("attribute_values") @Nullable public ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel getAttributeValues() { @@ -71,6 +66,17 @@ public ExperimentalComposableRuleBasedSamplerRuleModel withAttributeValues( return this; } + /** + * Patterns to match against a single attribute. Non-string attributes are matched using their + * string representation: + * + *

    for example, a pattern of "4*" would match any http.response.status_code in 400-499. For + * array attributes, if any + * + *

    item matches, it is considered a match. + * + *

    If omitted, ignore. + */ @JsonProperty("attribute_patterns") @Nullable public ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel getAttributePatterns() { @@ -84,10 +90,21 @@ public ExperimentalComposableRuleBasedSamplerRuleModel withAttributePatterns( } /** - * The span kinds to match. If the span's kind matches any of these, it matches. Values include: * - * client: client, a client span. * consumer: consumer, a consumer span. * internal: internal, an - * internal span. * producer: producer, a producer span. * server: server, a server span. If - * omitted, ignore. + * The span kinds to match. If the span's kind matches any of these, it matches. + * + *

    Values include: + * + *

    * client: client, a client span. + * + *

    * consumer: consumer, a consumer span. + * + *

    * internal: internal, an internal span. + * + *

    * producer: producer, a producer span. + * + *

    * server: server, a server span. + * + *

    If omitted, ignore. */ @JsonProperty("span_kinds") @Nullable @@ -101,8 +118,17 @@ public ExperimentalComposableRuleBasedSamplerRuleModel withSpanKinds(ListValues include: + * + *

    * local: local, a local parent. + * + *

    * none: none, no parent, i.e., the trace root. + * + *

    * remote: remote, a remote parent. + * + *

    If omitted, ignore. */ @JsonProperty("parent") @Nullable @@ -116,7 +142,11 @@ public ExperimentalComposableRuleBasedSamplerRuleModel withParent( return this; } - /** (Required) */ + /** + * The sampler to use for matching spans. + * + *

    Property is required and must be non-null. + */ @JsonProperty("sampler") @Nullable public ExperimentalComposableSamplerModel getSampler() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableSamplerModel.java index ebd3e98b2f4..37e24ba34be 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableSamplerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableSamplerModel.java @@ -45,6 +45,11 @@ public class ExperimentalComposableSamplerModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Configure sampler to be always_off. + * + *

    If omitted, ignore. + */ @JsonProperty("always_off") @Nullable public ExperimentalComposableAlwaysOffSamplerModel getAlwaysOff() { @@ -57,6 +62,11 @@ public ExperimentalComposableSamplerModel withAlwaysOff( return this; } + /** + * Configure sampler to be always_on. + * + *

    If omitted, ignore. + */ @JsonProperty("always_on") @Nullable public ExperimentalComposableAlwaysOnSamplerModel getAlwaysOn() { @@ -69,6 +79,11 @@ public ExperimentalComposableSamplerModel withAlwaysOn( return this; } + /** + * Configure sampler to be parent_threshold. + * + *

    If omitted, ignore. + */ @JsonProperty("parent_threshold") @Nullable public ExperimentalComposableParentThresholdSamplerModel getParentThreshold() { @@ -81,6 +96,11 @@ public ExperimentalComposableSamplerModel withParentThreshold( return this; } + /** + * Configure sampler to be probability. + * + *

    If omitted, ignore. + */ @JsonProperty("probability") @Nullable public ExperimentalComposableProbabilitySamplerModel getProbability() { @@ -93,6 +113,11 @@ public ExperimentalComposableSamplerModel withProbability( return this; } + /** + * Configure sampler to be rule_based. + * + *

    If omitted, ignore. + */ @JsonProperty("rule_based") @Nullable public ExperimentalComposableRuleBasedSamplerModel getRuleBased() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalDbInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalDbInstrumentationModel.java index 777e65f9f71..2e5d1971fda 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalDbInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalDbInstrumentationModel.java @@ -20,6 +20,17 @@ public class ExperimentalDbInstrumentationModel { @Nullable private ExperimentalSemconvConfigModel semconv; + /** + * Configure database semantic convention version and migration behavior. + * + *

    This property takes precedence over the + * .instrumentation/development.general.stability_opt_in_list setting. + * + *

    See database migration: https://opentelemetry.io/docs/specs/semconv/database/ + * + *

    If omitted, uses the general stability_opt_in_list setting, or instrumentations continue + * emitting their default semantic convention version if not set. + */ @JsonProperty("semconv") @Nullable public ExperimentalSemconvConfigModel getSemconv() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalGenAiInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalGenAiInstrumentationModel.java index b7a57e94bc1..0247dce456f 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalGenAiInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalGenAiInstrumentationModel.java @@ -20,6 +20,17 @@ public class ExperimentalGenAiInstrumentationModel { @Nullable private ExperimentalSemconvConfigModel semconv; + /** + * Configure GenAI semantic convention version and migration behavior. + * + *

    This property takes precedence over the + * .instrumentation/development.general.stability_opt_in_list setting. + * + *

    See GenAI semantic conventions: https://opentelemetry.io/docs/specs/semconv/gen-ai/ + * + *

    If omitted, uses the general stability_opt_in_list setting, or instrumentations continue + * emitting their default semantic convention version if not set. + */ @JsonProperty("semconv") @Nullable public ExperimentalSemconvConfigModel getSemconv() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalGeneralInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalGeneralInstrumentationModel.java index 2168e2d65a0..e609dbe786a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalGeneralInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalGeneralInstrumentationModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -54,41 +53,17 @@ public class ExperimentalGeneralInstrumentationModel { @Nullable private ExperimentalSanitizationModel sanitization; - /** - * Configure semantic convention stability opt-in as a comma-separated list. This property follows - * the format and semantics of the OTEL_SEMCONV_STABILITY_OPT_IN environment variable. Controls - * the emission of stable vs. experimental semantic conventions for instrumentation. This setting - * is only intended for migrating from experimental to stable semantic conventions. - * - *

    Known values include: - http: Emit stable HTTP and networking conventions only - http/dup: - * Emit both old and stable HTTP and networking conventions (for phased migration) - database: - * Emit stable database conventions only - database/dup: Emit both old and stable database - * conventions (for phased migration) - rpc: Emit stable RPC conventions only - rpc/dup: Emit both - * experimental and stable RPC conventions (for phased migration) - messaging: Emit stable - * messaging conventions only - messaging/dup: Emit both old and stable messaging conventions (for - * phased migration) - code: Emit stable code conventions only - code/dup: Emit both old and - * stable code conventions (for phased migration) - * - *

    Multiple values can be specified as a comma-separated list (e.g., "http,database/dup"). - * Additional signal types may be supported in future versions. - * - *

    Domain-specific semconv properties (e.g., .instrumentation/development.general.db.semconv) - * take precedence over this general setting. - * - *

    See: - HTTP migration: - * https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/ - Database migration: - * https://opentelemetry.io/docs/specs/semconv/database/ - RPC: - * https://opentelemetry.io/docs/specs/semconv/rpc/ - Messaging: - * https://opentelemetry.io/docs/specs/semconv/messaging/messaging-spans/ If omitted or null, no - * opt-in is configured and instrumentations continue emitting their default semantic convention - * version. - */ @JsonProperty("stability_opt_in_list") - @JsonPropertyDescription( - "Configure semantic convention stability opt-in as a comma-separated list.\nThis property follows the format and semantics of the OTEL_SEMCONV_STABILITY_OPT_IN environment variable.\nControls the emission of stable vs. experimental semantic conventions for instrumentation.\nThis setting is only intended for migrating from experimental to stable semantic conventions.\n\nKnown values include:\n- http: Emit stable HTTP and networking conventions only\n- http/dup: Emit both old and stable HTTP and networking conventions (for phased migration)\n- database: Emit stable database conventions only\n- database/dup: Emit both old and stable database conventions (for phased migration)\n- rpc: Emit stable RPC conventions only\n- rpc/dup: Emit both experimental and stable RPC conventions (for phased migration)\n- messaging: Emit stable messaging conventions only\n- messaging/dup: Emit both old and stable messaging conventions (for phased migration)\n- code: Emit stable code conventions only\n- code/dup: Emit both old and stable code conventions (for phased migration)\n\nMultiple values can be specified as a comma-separated list (e.g., \"http,database/dup\").\nAdditional signal types may be supported in future versions.\n\nDomain-specific semconv properties (e.g., .instrumentation/development.general.db.semconv) take precedence over this general setting.\n\nSee:\n- HTTP migration: https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/\n- Database migration: https://opentelemetry.io/docs/specs/semconv/database/\n- RPC: https://opentelemetry.io/docs/specs/semconv/rpc/\n- Messaging: https://opentelemetry.io/docs/specs/semconv/messaging/messaging-spans/\nIf omitted or null, no opt-in is configured and instrumentations continue emitting their default semantic convention version.\n") @Nullable private String stabilityOptInList; + /** + * Configure instrumentations following the http semantic conventions. + * + *

    See http semantic conventions: https://opentelemetry.io/docs/specs/semconv/http/ + * + *

    If omitted, defaults as described in ExperimentalHttpInstrumentation are used. + */ @JsonProperty("http") @Nullable public ExperimentalHttpInstrumentationModel getHttp() { @@ -101,6 +76,14 @@ public ExperimentalGeneralInstrumentationModel withHttp( return this; } + /** + * Configure instrumentations following the code semantic conventions. + * + *

    See code semantic conventions: + * https://opentelemetry.io/docs/specs/semconv/registry/attributes/code/ + * + *

    If omitted, defaults as described in ExperimentalCodeInstrumentation are used. + */ @JsonProperty("code") @Nullable public ExperimentalCodeInstrumentationModel getCode() { @@ -113,6 +96,13 @@ public ExperimentalGeneralInstrumentationModel withCode( return this; } + /** + * Configure instrumentations following the database semantic conventions. + * + *

    See database semantic conventions: https://opentelemetry.io/docs/specs/semconv/database/ + * + *

    If omitted, defaults as described in ExperimentalDbInstrumentation are used. + */ @JsonProperty("db") @Nullable public ExperimentalDbInstrumentationModel getDb() { @@ -124,6 +114,13 @@ public ExperimentalGeneralInstrumentationModel withDb(ExperimentalDbInstrumentat return this; } + /** + * Configure instrumentations following the GenAI semantic conventions. + * + *

    See GenAI semantic conventions: https://opentelemetry.io/docs/specs/semconv/gen-ai/ + * + *

    If omitted, defaults as described in ExperimentalGenAiInstrumentation are used. + */ @JsonProperty("gen_ai") @Nullable public ExperimentalGenAiInstrumentationModel getGenAi() { @@ -136,6 +133,13 @@ public ExperimentalGeneralInstrumentationModel withGenAi( return this; } + /** + * Configure instrumentations following the messaging semantic conventions. + * + *

    See messaging semantic conventions: https://opentelemetry.io/docs/specs/semconv/messaging/ + * + *

    If omitted, defaults as described in ExperimentalMessagingInstrumentation are used. + */ @JsonProperty("messaging") @Nullable public ExperimentalMessagingInstrumentationModel getMessaging() { @@ -148,6 +152,13 @@ public ExperimentalGeneralInstrumentationModel withMessaging( return this; } + /** + * Configure instrumentations following the RPC semantic conventions. + * + *

    See RPC semantic conventions: https://opentelemetry.io/docs/specs/semconv/rpc/ + * + *

    If omitted, defaults as described in ExperimentalRpcInstrumentation are used. + */ @JsonProperty("rpc") @Nullable public ExperimentalRpcInstrumentationModel getRpc() { @@ -159,6 +170,11 @@ public ExperimentalGeneralInstrumentationModel withRpc(ExperimentalRpcInstrument return this; } + /** + * Configure general sanitization options. + * + *

    If omitted, defaults as described in ExperimentalSanitization are used. + */ @JsonProperty("sanitization") @Nullable public ExperimentalSanitizationModel getSanitization() { @@ -172,33 +188,57 @@ public ExperimentalGeneralInstrumentationModel withSanitization( } /** - * Configure semantic convention stability opt-in as a comma-separated list. This property follows - * the format and semantics of the OTEL_SEMCONV_STABILITY_OPT_IN environment variable. Controls - * the emission of stable vs. experimental semantic conventions for instrumentation. This setting - * is only intended for migrating from experimental to stable semantic conventions. - * - *

    Known values include: - http: Emit stable HTTP and networking conventions only - http/dup: - * Emit both old and stable HTTP and networking conventions (for phased migration) - database: - * Emit stable database conventions only - database/dup: Emit both old and stable database - * conventions (for phased migration) - rpc: Emit stable RPC conventions only - rpc/dup: Emit both - * experimental and stable RPC conventions (for phased migration) - messaging: Emit stable - * messaging conventions only - messaging/dup: Emit both old and stable messaging conventions (for - * phased migration) - code: Emit stable code conventions only - code/dup: Emit both old and - * stable code conventions (for phased migration) + * Configure semantic convention stability opt-in as a comma-separated list. + * + *

    This property follows the format and semantics of the OTEL_SEMCONV_STABILITY_OPT_IN + * environment variable. + * + *

    Controls the emission of stable vs. experimental semantic conventions for instrumentation. + * + *

    This setting is only intended for migrating from experimental to stable semantic + * conventions. + * + *

    Known values include: + * + *

    - http: Emit stable HTTP and networking conventions only + * + *

    - http/dup: Emit both old and stable HTTP and networking conventions (for phased migration) + * + *

    - database: Emit stable database conventions only + * + *

    - database/dup: Emit both old and stable database conventions (for phased migration) + * + *

    - rpc: Emit stable RPC conventions only + * + *

    - rpc/dup: Emit both experimental and stable RPC conventions (for phased migration) + * + *

    - messaging: Emit stable messaging conventions only + * + *

    - messaging/dup: Emit both old and stable messaging conventions (for phased migration) + * + *

    - code: Emit stable code conventions only + * + *

    - code/dup: Emit both old and stable code conventions (for phased migration) * *

    Multiple values can be specified as a comma-separated list (e.g., "http,database/dup"). - * Additional signal types may be supported in future versions. + * + *

    Additional signal types may be supported in future versions. * *

    Domain-specific semconv properties (e.g., .instrumentation/development.general.db.semconv) * take precedence over this general setting. * - *

    See: - HTTP migration: - * https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/ - Database migration: - * https://opentelemetry.io/docs/specs/semconv/database/ - RPC: - * https://opentelemetry.io/docs/specs/semconv/rpc/ - Messaging: - * https://opentelemetry.io/docs/specs/semconv/messaging/messaging-spans/ If omitted or null, no - * opt-in is configured and instrumentations continue emitting their default semantic convention - * version. + *

    See: + * + *

    - HTTP migration: https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/ + * + *

    - Database migration: https://opentelemetry.io/docs/specs/semconv/database/ + * + *

    - RPC: https://opentelemetry.io/docs/specs/semconv/rpc/ + * + *

    - Messaging: https://opentelemetry.io/docs/specs/semconv/messaging/messaging-spans/ + * + *

    If omitted or null, no opt-in is configured and instrumentations continue emitting their + * default semantic convention version. */ @JsonProperty("stability_opt_in_list") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpClientInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpClientInstrumentationModel.java index 388c5b945f7..007dfd90c7c 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpClientInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpClientInstrumentationModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,41 +17,22 @@ @Generated("jsonschema2pojo") public class ExperimentalHttpClientInstrumentationModel { - /** - * Configure headers to capture for outbound http requests. If omitted, no outbound request - * headers are captured. - */ @JsonProperty("request_captured_headers") - @JsonPropertyDescription( - "Configure headers to capture for outbound http requests.\nIf omitted, no outbound request headers are captured.\n") @Nullable private List requestCapturedHeaders; - /** - * Configure headers to capture for inbound http responses. If omitted, no inbound response - * headers are captured. - */ @JsonProperty("response_captured_headers") - @JsonPropertyDescription( - "Configure headers to capture for inbound http responses.\nIf omitted, no inbound response headers are captured.\n") @Nullable private List responseCapturedHeaders; - /** - * Override the default list of known HTTP methods. Known methods are case-sensitive. This is a - * full override of the default known methods, not a list of known methods in addition to the - * defaults. If omitted, HTTP methods GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH - * are known. - */ @JsonProperty("known_methods") - @JsonPropertyDescription( - "Override the default list of known HTTP methods.\nKnown methods are case-sensitive.\nThis is a full override of the default known methods, not a list of known methods in addition to the defaults.\nIf omitted, HTTP methods GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH are known.\n") @Nullable private List knownMethods; /** - * Configure headers to capture for outbound http requests. If omitted, no outbound request - * headers are captured. + * Configure headers to capture for outbound http requests. + * + *

    If omitted, no outbound request headers are captured. */ @JsonProperty("request_captured_headers") @Nullable @@ -67,8 +47,9 @@ public ExperimentalHttpClientInstrumentationModel withRequestCapturedHeaders( } /** - * Configure headers to capture for inbound http responses. If omitted, no inbound response - * headers are captured. + * Configure headers to capture for inbound http responses. + * + *

    If omitted, no inbound response headers are captured. */ @JsonProperty("response_captured_headers") @Nullable @@ -83,10 +64,15 @@ public ExperimentalHttpClientInstrumentationModel withResponseCapturedHeaders( } /** - * Override the default list of known HTTP methods. Known methods are case-sensitive. This is a - * full override of the default known methods, not a list of known methods in addition to the - * defaults. If omitted, HTTP methods GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH - * are known. + * Override the default list of known HTTP methods. + * + *

    Known methods are case-sensitive. + * + *

    This is a full override of the default known methods, not a list of known methods in + * addition to the defaults. + * + *

    If omitted, HTTP methods GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH are + * known. */ @JsonProperty("known_methods") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpInstrumentationModel.java index e975437754e..d03317d3989 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpInstrumentationModel.java @@ -28,6 +28,18 @@ public class ExperimentalHttpInstrumentationModel { @Nullable private ExperimentalHttpServerInstrumentationModel server; + /** + * Configure HTTP semantic convention version and migration behavior. + * + *

    This property takes precedence over the + * .instrumentation/development.general.stability_opt_in_list setting. + * + *

    See HTTP migration: + * https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/ + * + *

    If omitted, uses the general stability_opt_in_list setting, or instrumentations continue + * emitting their default semantic convention version if not set. + */ @JsonProperty("semconv") @Nullable public ExperimentalSemconvConfigModel getSemconv() { @@ -39,6 +51,11 @@ public ExperimentalHttpInstrumentationModel withSemconv(ExperimentalSemconvConfi return this; } + /** + * Configure instrumentations following the http client semantic conventions. + * + *

    If omitted, defaults as described in ExperimentalHttpClientInstrumentation are used. + */ @JsonProperty("client") @Nullable public ExperimentalHttpClientInstrumentationModel getClient() { @@ -51,6 +68,11 @@ public ExperimentalHttpInstrumentationModel withClient( return this; } + /** + * Configure instrumentations following the http server semantic conventions. + * + *

    If omitted, defaults as described in ExperimentalHttpServerInstrumentation are used. + */ @JsonProperty("server") @Nullable public ExperimentalHttpServerInstrumentationModel getServer() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpServerInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpServerInstrumentationModel.java index 1baef807027..13ff32f6257 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpServerInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHttpServerInstrumentationModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,41 +17,22 @@ @Generated("jsonschema2pojo") public class ExperimentalHttpServerInstrumentationModel { - /** - * Configure headers to capture for inbound http requests. If omitted, no request headers are - * captured. - */ @JsonProperty("request_captured_headers") - @JsonPropertyDescription( - "Configure headers to capture for inbound http requests.\nIf omitted, no request headers are captured.\n") @Nullable private List requestCapturedHeaders; - /** - * Configure headers to capture for outbound http responses. If omitted, no response headers are - * captures. - */ @JsonProperty("response_captured_headers") - @JsonPropertyDescription( - "Configure headers to capture for outbound http responses.\nIf omitted, no response headers are captures.\n") @Nullable private List responseCapturedHeaders; - /** - * Override the default list of known HTTP methods. Known methods are case-sensitive. This is a - * full override of the default known methods, not a list of known methods in addition to the - * defaults. If omitted, HTTP methods GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH - * are known. - */ @JsonProperty("known_methods") - @JsonPropertyDescription( - "Override the default list of known HTTP methods.\nKnown methods are case-sensitive.\nThis is a full override of the default known methods, not a list of known methods in addition to the defaults.\nIf omitted, HTTP methods GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH are known.\n") @Nullable private List knownMethods; /** - * Configure headers to capture for inbound http requests. If omitted, no request headers are - * captured. + * Configure headers to capture for inbound http requests. + * + *

    If omitted, no request headers are captured. */ @JsonProperty("request_captured_headers") @Nullable @@ -67,8 +47,9 @@ public ExperimentalHttpServerInstrumentationModel withRequestCapturedHeaders( } /** - * Configure headers to capture for outbound http responses. If omitted, no response headers are - * captures. + * Configure headers to capture for outbound http responses. + * + *

    If omitted, no response headers are captures. */ @JsonProperty("response_captured_headers") @Nullable @@ -83,10 +64,15 @@ public ExperimentalHttpServerInstrumentationModel withResponseCapturedHeaders( } /** - * Override the default list of known HTTP methods. Known methods are case-sensitive. This is a - * full override of the default known methods, not a list of known methods in addition to the - * defaults. If omitted, HTTP methods GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH - * are known. + * Override the default list of known HTTP methods. + * + *

    Known methods are case-sensitive. + * + *

    This is a full override of the default known methods, not a list of known methods in + * addition to the defaults. + * + *

    If omitted, HTTP methods GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH are + * known. */ @JsonProperty("known_methods") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalInstrumentationModel.java index 98c8cc4800e..3ee65cd202f 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalInstrumentationModel.java @@ -66,6 +66,14 @@ public class ExperimentalInstrumentationModel { @Nullable private ExperimentalLanguageSpecificInstrumentationModel swift; + /** + * Configure general SemConv options that may apply to multiple languages and instrumentations. + * + *

    Instrumenation may merge general config options with the language specific configuration at + * .instrumentation.. + * + *

    If omitted, default values as described in ExperimentalGeneralInstrumentation are used. + */ @JsonProperty("general") @Nullable public ExperimentalGeneralInstrumentationModel getGeneral() { @@ -78,6 +86,11 @@ public ExperimentalInstrumentationModel withGeneral( return this; } + /** + * Configure C++ language-specific instrumentation libraries. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("cpp") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getCpp() { @@ -90,6 +103,14 @@ public ExperimentalInstrumentationModel withCpp( return this; } + /** + * Configure .NET language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("dotnet") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getDotnet() { @@ -102,6 +123,14 @@ public ExperimentalInstrumentationModel withDotnet( return this; } + /** + * Configure Erlang language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("erlang") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getErlang() { @@ -114,6 +143,14 @@ public ExperimentalInstrumentationModel withErlang( return this; } + /** + * Configure Go language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("go") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getGo() { @@ -126,6 +163,14 @@ public ExperimentalInstrumentationModel withGo( return this; } + /** + * Configure Java language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("java") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getJava() { @@ -138,6 +183,14 @@ public ExperimentalInstrumentationModel withJava( return this; } + /** + * Configure JavaScript language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("js") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getJs() { @@ -150,6 +203,14 @@ public ExperimentalInstrumentationModel withJs( return this; } + /** + * Configure PHP language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("php") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getPhp() { @@ -162,6 +223,14 @@ public ExperimentalInstrumentationModel withPhp( return this; } + /** + * Configure Python language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("python") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getPython() { @@ -174,6 +243,14 @@ public ExperimentalInstrumentationModel withPython( return this; } + /** + * Configure Ruby language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("ruby") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getRuby() { @@ -186,6 +263,14 @@ public ExperimentalInstrumentationModel withRuby( return this; } + /** + * Configure Rust language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("rust") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getRust() { @@ -198,6 +283,14 @@ public ExperimentalInstrumentationModel withRust( return this; } + /** + * Configure Swift language-specific instrumentation libraries. + * + *

    Each entry's key identifies a particular instrumentation library. The corresponding value + * configures it. + * + *

    If omitted, instrumentation defaults are used. + */ @JsonProperty("swift") @Nullable public ExperimentalLanguageSpecificInstrumentationModel getSwift() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalJaegerRemoteSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalJaegerRemoteSamplerModel.java index 219012c2a86..891b4ec7857 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalJaegerRemoteSamplerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalJaegerRemoteSamplerModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; import javax.annotation.Generated; @@ -18,38 +17,22 @@ @Generated("jsonschema2pojo") public class ExperimentalJaegerRemoteSamplerModel { - /** - * Configure the endpoint of the jaeger remote sampling service. Property is required and must be - * non-null. - * - *

    (Required) - */ @JsonProperty("endpoint") - @JsonPropertyDescription( - "Configure the endpoint of the jaeger remote sampling service.\nProperty is required and must be non-null.\n") @Nullable private String endpoint; - /** - * Configure the polling interval (in milliseconds) to fetch from the remote sampling service. If - * omitted or null, 60000 is used. - */ @JsonProperty("interval") - @JsonPropertyDescription( - "Configure the polling interval (in milliseconds) to fetch from the remote sampling service.\nIf omitted or null, 60000 is used.\n") @Nullable private Integer interval; - /** (Required) */ @JsonProperty("initial_sampler") @Nullable private SamplerModel initialSampler; /** - * Configure the endpoint of the jaeger remote sampling service. Property is required and must be - * non-null. + * Configure the endpoint of the jaeger remote sampling service. * - *

    (Required) + *

    Property is required and must be non-null. */ @JsonProperty("endpoint") @Nullable @@ -63,8 +46,9 @@ public ExperimentalJaegerRemoteSamplerModel withEndpoint(String endpoint) { } /** - * Configure the polling interval (in milliseconds) to fetch from the remote sampling service. If - * omitted or null, 60000 is used. + * Configure the polling interval (in milliseconds) to fetch from the remote sampling service. + * + *

    If omitted or null, 60000 is used. */ @JsonProperty("interval") @Nullable @@ -77,7 +61,11 @@ public ExperimentalJaegerRemoteSamplerModel withInterval(Integer interval) { return this; } - /** (Required) */ + /** + * Configure the initial sampler used before first configuration is fetched. + * + *

    Property is required and must be non-null. + */ @JsonProperty("initial_sampler") @Nullable public SamplerModel getInitialSampler() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerConfigModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerConfigModel.java index 9abf81782c7..bbe672d1dd5 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerConfigModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerConfigModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,10 +16,7 @@ @Generated("jsonschema2pojo") public class ExperimentalLoggerConfigModel { - /** Configure if the logger is enabled or not. If omitted or null, true is used. */ @JsonProperty("enabled") - @JsonPropertyDescription( - "Configure if the logger is enabled or not.\nIf omitted or null, true is used.\n") @Nullable private Boolean enabled; @@ -30,18 +26,15 @@ public class ExperimentalLoggerConfigModel { .SeverityNumber minimumSeverity; - /** - * Configure trace based filtering. If true, log records associated with unsampled trace contexts - * traces are not processed. If false, or if a log record is not associated with a trace context, - * trace based filtering is not applied. If omitted or null, trace based filtering is not applied. - */ @JsonProperty("trace_based") - @JsonPropertyDescription( - "Configure trace based filtering.\nIf true, log records associated with unsampled trace contexts traces are not processed. If false, or if a log record is not associated with a trace context, trace based filtering is not applied.\nIf omitted or null, trace based filtering is not applied.\n") @Nullable private Boolean traceBased; - /** Configure if the logger is enabled or not. If omitted or null, true is used. */ + /** + * Configure if the logger is enabled or not. + * + *

    If omitted or null, true is used. + */ @JsonProperty("enabled") @Nullable public Boolean getEnabled() { @@ -53,6 +46,64 @@ public ExperimentalLoggerConfigModel withEnabled(Boolean enabled) { return this; } + /** + * Configure severity filtering. + * + *

    Log records with an non-zero (i.e. unspecified) severity number which is less than + * minimum_severity are not processed. + * + *

    Values include: + * + *

    * debug: debug, severity number 5. + * + *

    * debug2: debug2, severity number 6. + * + *

    * debug3: debug3, severity number 7. + * + *

    * debug4: debug4, severity number 8. + * + *

    * error: error, severity number 17. + * + *

    * error2: error2, severity number 18. + * + *

    * error3: error3, severity number 19. + * + *

    * error4: error4, severity number 20. + * + *

    * fatal: fatal, severity number 21. + * + *

    * fatal2: fatal2, severity number 22. + * + *

    * fatal3: fatal3, severity number 23. + * + *

    * fatal4: fatal4, severity number 24. + * + *

    * info: info, severity number 9. + * + *

    * info2: info2, severity number 10. + * + *

    * info3: info3, severity number 11. + * + *

    * info4: info4, severity number 12. + * + *

    * trace: trace, severity number 1. + * + *

    * trace2: trace2, severity number 2. + * + *

    * trace3: trace3, severity number 3. + * + *

    * trace4: trace4, severity number 4. + * + *

    * warn: warn, severity number 13. + * + *

    * warn2: warn2, severity number 14. + * + *

    * warn3: warn3, severity number 15. + * + *

    * warn4: warn4, severity number 16. + * + *

    If omitted, severity filtering is not applied. + */ @JsonProperty("minimum_severity") @Nullable public io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel @@ -70,9 +121,13 @@ public ExperimentalLoggerConfigModel withMinimumSeverity( } /** - * Configure trace based filtering. If true, log records associated with unsampled trace contexts - * traces are not processed. If false, or if a log record is not associated with a trace context, - * trace based filtering is not applied. If omitted or null, trace based filtering is not applied. + * Configure trace based filtering. + * + *

    If true, log records associated with unsampled trace contexts traces are not processed. If + * false, or if a log record is not associated with a trace context, trace based filtering is not + * applied. + * + *

    If omitted or null, trace based filtering is not applied. */ @JsonProperty("trace_based") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerConfiguratorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerConfiguratorModel.java index daadf07eef7..c3f6354ed97 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerConfiguratorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerConfiguratorModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -22,12 +21,16 @@ public class ExperimentalLoggerConfiguratorModel { @Nullable private ExperimentalLoggerConfigModel defaultConfig; - /** Configure loggers. If omitted, all loggers use .default_config. */ @JsonProperty("loggers") - @JsonPropertyDescription("Configure loggers.\nIf omitted, all loggers use .default_config.\n") @Nullable private List loggers; + /** + * Configure the default logger config used there is no matching entry in + * .logger_configurator/development.loggers. + * + *

    If omitted, unmatched .loggers use default values as described in ExperimentalLoggerConfig. + */ @JsonProperty("default_config") @Nullable public ExperimentalLoggerConfigModel getDefaultConfig() { @@ -40,7 +43,11 @@ public ExperimentalLoggerConfiguratorModel withDefaultConfig( return this; } - /** Configure loggers. If omitted, all loggers use .default_config. */ + /** + * Configure loggers. + * + *

    If omitted, all loggers use .default_config. + */ @JsonProperty("loggers") @Nullable public List getLoggers() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerMatcherAndConfigModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerMatcherAndConfigModel.java index 559e577eeda..0c111ab870a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerMatcherAndConfigModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLoggerMatcherAndConfigModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,22 +16,10 @@ @Generated("jsonschema2pojo") public class ExperimentalLoggerMatcherAndConfigModel { - /** - * Configure logger names to match. Matching is case-sensitive, evaluated as follows: - * - *

    * If the logger name exactly matches. * If the logger name matches the wildcard pattern, - * where '?' matches any single character and '*' matches any number of characters including none. - * Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("name") - @JsonPropertyDescription( - "Configure logger names to match. Matching is case-sensitive, evaluated as follows:\n\n * If the logger name exactly matches.\n * If the logger name matches the wildcard pattern, where '?' matches any single character and '*' matches any number of characters including none.\nProperty is required and must be non-null.\n") @Nullable private String name; - /** (Required) */ @JsonProperty("config") @Nullable private ExperimentalLoggerConfigModel config; @@ -40,11 +27,12 @@ public class ExperimentalLoggerMatcherAndConfigModel { /** * Configure logger names to match. Matching is case-sensitive, evaluated as follows: * - *

    * If the logger name exactly matches. * If the logger name matches the wildcard pattern, - * where '?' matches any single character and '*' matches any number of characters including none. - * Property is required and must be non-null. + *

    * If the logger name exactly matches. * - *

    (Required) + *

    * If the logger name matches the wildcard pattern, where '?' matches any single character + * and '*' matches any number of characters including none. + * + *

    Property is required and must be non-null. */ @JsonProperty("name") @Nullable @@ -57,7 +45,11 @@ public ExperimentalLoggerMatcherAndConfigModel withName(String name) { return this; } - /** (Required) */ + /** + * The logger config. + * + *

    Property is required and must be non-null. + */ @JsonProperty("config") @Nullable public ExperimentalLoggerConfigModel getConfig() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMessagingInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMessagingInstrumentationModel.java index 7e83f9c1829..8afa18185e2 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMessagingInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMessagingInstrumentationModel.java @@ -20,6 +20,17 @@ public class ExperimentalMessagingInstrumentationModel { @Nullable private ExperimentalSemconvConfigModel semconv; + /** + * Configure messaging semantic convention version and migration behavior. + * + *

    This property takes precedence over the + * .instrumentation/development.general.stability_opt_in_list setting. + * + *

    See messaging semantic conventions: https://opentelemetry.io/docs/specs/semconv/messaging/ + * + *

    If omitted, uses the general stability_opt_in_list setting, or instrumentations continue + * emitting their default semantic convention version if not set. + */ @JsonProperty("semconv") @Nullable public ExperimentalSemconvConfigModel getSemconv() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterConfigModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterConfigModel.java index 04cb409272c..9e13a961a57 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterConfigModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterConfigModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,13 +16,15 @@ @Generated("jsonschema2pojo") public class ExperimentalMeterConfigModel { - /** Configure if the meter is enabled or not. If omitted, true is used. */ @JsonProperty("enabled") - @JsonPropertyDescription("Configure if the meter is enabled or not.\nIf omitted, true is used.\n") @Nullable private Boolean enabled; - /** Configure if the meter is enabled or not. If omitted, true is used. */ + /** + * Configure if the meter is enabled or not. + * + *

    If omitted, true is used. + */ @JsonProperty("enabled") @Nullable public Boolean getEnabled() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterConfiguratorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterConfiguratorModel.java index 7351636a0ee..8438ef82fa3 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterConfiguratorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterConfiguratorModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -22,12 +21,16 @@ public class ExperimentalMeterConfiguratorModel { @Nullable private ExperimentalMeterConfigModel defaultConfig; - /** Configure meters. If omitted, all meters used .default_config. */ @JsonProperty("meters") - @JsonPropertyDescription("Configure meters.\nIf omitted, all meters used .default_config.\n") @Nullable private List meters; + /** + * Configure the default meter config used there is no matching entry in + * .meter_configurator/development.meters. + * + *

    If omitted, unmatched .meters use default values as described in ExperimentalMeterConfig. + */ @JsonProperty("default_config") @Nullable public ExperimentalMeterConfigModel getDefaultConfig() { @@ -40,7 +43,11 @@ public ExperimentalMeterConfiguratorModel withDefaultConfig( return this; } - /** Configure meters. If omitted, all meters used .default_config. */ + /** + * Configure meters. + * + *

    If omitted, all meters used .default_config. + */ @JsonProperty("meters") @Nullable public List getMeters() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterMatcherAndConfigModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterMatcherAndConfigModel.java index 2d0ecb1afdb..1c3493cc578 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterMatcherAndConfigModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalMeterMatcherAndConfigModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,22 +16,10 @@ @Generated("jsonschema2pojo") public class ExperimentalMeterMatcherAndConfigModel { - /** - * Configure meter names to match. Matching is case-sensitive, evaluated as follows: - * - *

    * If the meter name exactly matches. * If the meter name matches the wildcard pattern, where - * '?' matches any single character and '*' matches any number of characters including none. - * Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("name") - @JsonPropertyDescription( - "Configure meter names to match. Matching is case-sensitive, evaluated as follows:\n\n * If the meter name exactly matches.\n * If the meter name matches the wildcard pattern, where '?' matches any single character and '*' matches any number of characters including none.\nProperty is required and must be non-null.\n") @Nullable private String name; - /** (Required) */ @JsonProperty("config") @Nullable private ExperimentalMeterConfigModel config; @@ -40,11 +27,12 @@ public class ExperimentalMeterMatcherAndConfigModel { /** * Configure meter names to match. Matching is case-sensitive, evaluated as follows: * - *

    * If the meter name exactly matches. * If the meter name matches the wildcard pattern, where - * '?' matches any single character and '*' matches any number of characters including none. - * Property is required and must be non-null. + *

    * If the meter name exactly matches. * - *

    (Required) + *

    * If the meter name matches the wildcard pattern, where '?' matches any single character and + * '*' matches any number of characters including none. + * + *

    Property is required and must be non-null. */ @JsonProperty("name") @Nullable @@ -57,7 +45,11 @@ public ExperimentalMeterMatcherAndConfigModel withName(String name) { return this; } - /** (Required) */ + /** + * The meter config. + * + *

    Property is required and must be non-null. + */ @JsonProperty("config") @Nullable public ExperimentalMeterConfigModel getConfig() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalOtlpFileExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalOtlpFileExporterModel.java index 64cf3598b04..571cf1e940c 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalOtlpFileExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalOtlpFileExporterModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,19 +16,16 @@ @Generated("jsonschema2pojo") public class ExperimentalOtlpFileExporterModel { - /** - * Configure output stream. Values include stdout, or scheme+destination. For example: - * file:///path/to/file.jsonl. If omitted or null, stdout is used. - */ @JsonProperty("output_stream") - @JsonPropertyDescription( - "Configure output stream. \nValues include stdout, or scheme+destination. For example: file:///path/to/file.jsonl.\nIf omitted or null, stdout is used.\n") @Nullable private String outputStream; /** - * Configure output stream. Values include stdout, or scheme+destination. For example: - * file:///path/to/file.jsonl. If omitted or null, stdout is used. + * Configure output stream. + * + *

    Values include stdout, or scheme+destination. For example: file:///path/to/file.jsonl. + * + *

    If omitted or null, stdout is used. */ @JsonProperty("output_stream") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalOtlpFileMetricExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalOtlpFileMetricExporterModel.java index cb74c8b129e..94d79882970 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalOtlpFileMetricExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalOtlpFileMetricExporterModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,13 +16,7 @@ @Generated("jsonschema2pojo") public class ExperimentalOtlpFileMetricExporterModel { - /** - * Configure output stream. Values include stdout, or scheme+destination. For example: - * file:///path/to/file.jsonl. If omitted or null, stdout is used. - */ @JsonProperty("output_stream") - @JsonPropertyDescription( - "Configure output stream. \nValues include stdout, or scheme+destination. For example: file:///path/to/file.jsonl.\nIf omitted or null, stdout is used.\n") @Nullable private String outputStream; @@ -40,8 +33,11 @@ public class ExperimentalOtlpFileMetricExporterModel { defaultHistogramAggregation; /** - * Configure output stream. Values include stdout, or scheme+destination. For example: - * file:///path/to/file.jsonl. If omitted or null, stdout is used. + * Configure output stream. + * + *

    Values include stdout, or scheme+destination. For example: file:///path/to/file.jsonl. + * + *

    If omitted or null, stdout is used. */ @JsonProperty("output_stream") @Nullable @@ -54,6 +50,21 @@ public ExperimentalOtlpFileMetricExporterModel withOutputStream(String outputStr return this; } + /** + * Configure temporality preference. + * + *

    Values include: + * + *

    * cumulative: Use cumulative aggregation temporality for all instrument types. + * + *

    * delta: Use delta aggregation for all instrument types except up down counter and + * asynchronous up down counter. + * + *

    * low_memory: Use delta aggregation temporality for counter and histogram instrument types. + * Use cumulative aggregation temporality for all other instrument types. + * + *

    If omitted, cumulative is used. + */ @JsonProperty("temporality_preference") @Nullable public io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel @@ -70,6 +81,19 @@ public ExperimentalOtlpFileMetricExporterModel withTemporalityPreference( return this; } + /** + * Configure default histogram aggregation. + * + *

    Values include: + * + *

    * base2_exponential_bucket_histogram: Use base2 exponential histogram as the default + * aggregation for histogram instruments. + * + *

    * explicit_bucket_histogram: Use explicit bucket histogram as the default aggregation for + * histogram instruments. + * + *

    If omitted, explicit_bucket_histogram is used. + */ @JsonProperty("default_histogram_aggregation") @Nullable public io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalProbabilitySamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalProbabilitySamplerModel.java index bfef0d482f0..1daa1b33579 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalProbabilitySamplerModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalProbabilitySamplerModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,13 +16,15 @@ @Generated("jsonschema2pojo") public class ExperimentalProbabilitySamplerModel { - /** Configure ratio. If omitted or null, 1.0 is used. */ @JsonProperty("ratio") - @JsonPropertyDescription("Configure ratio.\nIf omitted or null, 1.0 is used.\n") @Nullable private Double ratio; - /** Configure ratio. If omitted or null, 1.0 is used. */ + /** + * Configure ratio. + * + *

    If omitted or null, 1.0 is used. + */ @JsonProperty("ratio") @Nullable public Double getRatio() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalPrometheusMetricExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalPrometheusMetricExporterModel.java index 26a0a99f9ca..4bfceb0496d 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalPrometheusMetricExporterModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalPrometheusMetricExporterModel.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonValue; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel; @@ -29,35 +28,19 @@ @Generated("jsonschema2pojo") public class ExperimentalPrometheusMetricExporterModel { - /** Configure host. If omitted or null, localhost is used. */ @JsonProperty("host") - @JsonPropertyDescription("Configure host.\nIf omitted or null, localhost is used.\n") @Nullable private String host; - /** Configure port. If omitted or null, 9464 is used. */ @JsonProperty("port") - @JsonPropertyDescription("Configure port.\nIf omitted or null, 9464 is used.\n") @Nullable private Integer port; - /** - * Configure Prometheus Exporter to produce metrics with scope labels. If omitted or null, true is - * used. - */ @JsonProperty("scope_info_enabled") - @JsonPropertyDescription( - "Configure Prometheus Exporter to produce metrics with scope labels.\nIf omitted or null, true is used.\n") @Nullable private Boolean scopeInfoEnabled; - /** - * Configure Prometheus Exporter to produce metrics with a target info metric for the resource. If - * omitted or null, true is used. - */ @JsonProperty("target_info_enabled/development") - @JsonPropertyDescription( - "Configure Prometheus Exporter to produce metrics with a target info metric for the resource.\nIf omitted or null, true is used.\n") @Nullable private Boolean targetInfoEnabledDevelopment; @@ -70,7 +53,11 @@ public class ExperimentalPrometheusMetricExporterModel { private ExperimentalPrometheusMetricExporterModel.ExperimentalPrometheusTranslationStrategy translationStrategy; - /** Configure host. If omitted or null, localhost is used. */ + /** + * Configure host. + * + *

    If omitted or null, localhost is used. + */ @JsonProperty("host") @Nullable public String getHost() { @@ -82,7 +69,11 @@ public ExperimentalPrometheusMetricExporterModel withHost(String host) { return this; } - /** Configure port. If omitted or null, 9464 is used. */ + /** + * Configure port. + * + *

    If omitted or null, 9464 is used. + */ @JsonProperty("port") @Nullable public Integer getPort() { @@ -95,8 +86,9 @@ public ExperimentalPrometheusMetricExporterModel withPort(Integer port) { } /** - * Configure Prometheus Exporter to produce metrics with scope labels. If omitted or null, true is - * used. + * Configure Prometheus Exporter to produce metrics with scope labels. + * + *

    If omitted or null, true is used. */ @JsonProperty("scope_info_enabled") @Nullable @@ -110,8 +102,9 @@ public ExperimentalPrometheusMetricExporterModel withScopeInfoEnabled(Boolean sc } /** - * Configure Prometheus Exporter to produce metrics with a target info metric for the resource. If - * omitted or null, true is used. + * Configure Prometheus Exporter to produce metrics with a target info metric for the resource. + * + *

    If omitted or null, true is used. */ @JsonProperty("target_info_enabled/development") @Nullable @@ -125,6 +118,12 @@ public ExperimentalPrometheusMetricExporterModel withTargetInfoEnabledDevelopmen return this; } + /** + * Configure Prometheus Exporter to add resource attributes as metrics attributes, where the + * resource attribute keys match the patterns. + * + *

    If omitted, no resource attributes are added. + */ @JsonProperty("resource_constant_labels") @Nullable public IncludeExcludeModel getResourceConstantLabels() { @@ -137,6 +136,26 @@ public ExperimentalPrometheusMetricExporterModel withResourceConstantLabels( return this; } + /** + * Configure how metric names are translated to Prometheus metric names. + * + *

    Values include: + * + *

    * no_translation/development: Special character escaping is disabled. Type and unit suffixes + * are disabled. Metric names are unaltered. + * + *

    * no_utf8_escaping_with_suffixes/development: Special character escaping is disabled. Type + * and unit suffixes are enabled. + * + *

    * underscore_escaping_with_suffixes: Special character escaping is enabled. Type and unit + * suffixes are enabled. + * + *

    * underscore_escaping_without_suffixes/development: Special character escaping is enabled. + * Type and unit suffixes are disabled. This represents classic Prometheus metric name + * compatibility. + * + *

    If omitted, underscore_escaping_with_suffixes is used. + */ @JsonProperty("translation_strategy") @Nullable public ExperimentalPrometheusMetricExporterModel.ExperimentalPrometheusTranslationStrategy diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectionModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectionModel.java index a803f59140f..eac8e26be82 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectionModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectionModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel; import java.util.List; @@ -23,17 +22,15 @@ public class ExperimentalResourceDetectionModel { @Nullable private IncludeExcludeModel attributes; - /** - * Configure resource detectors. Resource detector names are dependent on the SDK language - * ecosystem. Please consult documentation for each respective language. If omitted, no resource - * detectors are enabled. - */ @JsonProperty("detectors") - @JsonPropertyDescription( - "Configure resource detectors.\nResource detector names are dependent on the SDK language ecosystem. Please consult documentation for each respective language. \nIf omitted, no resource detectors are enabled.\n") @Nullable private List detectors; + /** + * Configure attributes provided by resource detectors. + * + *

    If omitted, all attributes from resource detectors are added. + */ @JsonProperty("attributes") @Nullable public IncludeExcludeModel getAttributes() { @@ -46,9 +43,12 @@ public ExperimentalResourceDetectionModel withAttributes(IncludeExcludeModel att } /** - * Configure resource detectors. Resource detector names are dependent on the SDK language - * ecosystem. Please consult documentation for each respective language. If omitted, no resource - * detectors are enabled. + * Configure resource detectors. + * + *

    Resource detector names are dependent on the SDK language ecosystem. Please consult + * documentation for each respective language. + * + *

    If omitted, no resource detectors are enabled. */ @JsonProperty("detectors") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectorModel.java index b03a84c57d1..c73c9759af6 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectorModel.java @@ -41,6 +41,11 @@ public class ExperimentalResourceDetectorModel { private Map additionalProperties = new LinkedHashMap(); + /** + * Enable the container resource detector, which populates container.* attributes. + * + *

    If omitted, ignore. + */ @JsonProperty("container") @Nullable public ExperimentalContainerResourceDetectorModel getContainer() { @@ -53,6 +58,11 @@ public ExperimentalResourceDetectorModel withContainer( return this; } + /** + * Enable the host resource detector, which populates host.* and os.* attributes. + * + *

    If omitted, ignore. + */ @JsonProperty("host") @Nullable public ExperimentalHostResourceDetectorModel getHost() { @@ -64,6 +74,11 @@ public ExperimentalResourceDetectorModel withHost(ExperimentalHostResourceDetect return this; } + /** + * Enable the process resource detector, which populates process.* attributes. + * + *

    If omitted, ignore. + */ @JsonProperty("process") @Nullable public ExperimentalProcessResourceDetectorModel getProcess() { @@ -76,6 +91,12 @@ public ExperimentalResourceDetectorModel withProcess( return this; } + /** + * Enable the service detector, which populates service.name based on the OTEL_SERVICE_NAME + * environment variable and service.instance.id. + * + *

    If omitted, ignore. + */ @JsonProperty("service") @Nullable public ExperimentalServiceResourceDetectorModel getService() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalRpcInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalRpcInstrumentationModel.java index f816045710d..4f24b9e261f 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalRpcInstrumentationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalRpcInstrumentationModel.java @@ -20,6 +20,17 @@ public class ExperimentalRpcInstrumentationModel { @Nullable private ExperimentalSemconvConfigModel semconv; + /** + * Configure RPC semantic convention version and migration behavior. + * + *

    This property takes precedence over the + * .instrumentation/development.general.stability_opt_in_list setting. + * + *

    See RPC semantic conventions: https://opentelemetry.io/docs/specs/semconv/rpc/ + * + *

    If omitted, uses the general stability_opt_in_list setting, or instrumentations continue + * emitting their default semantic convention version if not set. + */ @JsonProperty("semconv") @Nullable public ExperimentalSemconvConfigModel getSemconv() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSanitizationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSanitizationModel.java index 86adae2874f..b2a23ba4700 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSanitizationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSanitizationModel.java @@ -20,6 +20,11 @@ public class ExperimentalSanitizationModel { @Nullable private ExperimentalUrlSanitizationModel url; + /** + * Configure URL sanitization options. + * + *

    If omitted, defaults as described in ExperimentalUrlSanitization are used. + */ @JsonProperty("url") @Nullable public ExperimentalUrlSanitizationModel getUrl() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSemconvConfigModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSemconvConfigModel.java index c0992eca72b..bb9652a298e 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSemconvConfigModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSemconvConfigModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,45 +16,23 @@ @Generated("jsonschema2pojo") public class ExperimentalSemconvConfigModel { - /** - * The target semantic convention version for this domain (e.g., 1). If omitted or null, the - * latest stable version is used, or if no stable version is available and .experimental is true - * then the latest experimental version is used. - */ @JsonProperty("version") - @JsonPropertyDescription( - "The target semantic convention version for this domain (e.g., 1).\nIf omitted or null, the latest stable version is used, or if no stable version is available and .experimental is true then the latest experimental version is used.\n") @Nullable private Integer version; - /** - * Use latest experimental semantic conventions (before stable is available or to enable - * experimental features on top of stable conventions). If omitted or null, false is used. - */ @JsonProperty("experimental") - @JsonPropertyDescription( - "Use latest experimental semantic conventions (before stable is available or to enable experimental features on top of stable conventions).\nIf omitted or null, false is used.\n") @Nullable private Boolean experimental; - /** - * When true, also emit the previous major version alongside the target version. For version=1, - * the previous version refers to the pre-stable conventions that the instrumentation emitted - * before the first stable semantic convention version was defined. For version=2 and above, the - * previous version is the prior stable major version (e.g., version=2, dual_emit=true emits both - * v2 and v1). Enables dual-emit for phased migration between versions. If omitted or null, false - * is used. - */ @JsonProperty("dual_emit") - @JsonPropertyDescription( - "When true, also emit the previous major version alongside the target version.\nFor version=1, the previous version refers to the pre-stable conventions that the instrumentation emitted before the first stable semantic convention version was defined.\nFor version=2 and above, the previous version is the prior stable major version (e.g., version=2, dual_emit=true emits both v2 and v1).\nEnables dual-emit for phased migration between versions.\nIf omitted or null, false is used.\n") @Nullable private Boolean dualEmit; /** - * The target semantic convention version for this domain (e.g., 1). If omitted or null, the - * latest stable version is used, or if no stable version is available and .experimental is true - * then the latest experimental version is used. + * The target semantic convention version for this domain (e.g., 1). + * + *

    If omitted or null, the latest stable version is used, or if no stable version is available + * and .experimental is true then the latest experimental version is used. */ @JsonProperty("version") @Nullable @@ -70,7 +47,9 @@ public ExperimentalSemconvConfigModel withVersion(Integer version) { /** * Use latest experimental semantic conventions (before stable is available or to enable - * experimental features on top of stable conventions). If omitted or null, false is used. + * experimental features on top of stable conventions). + * + *

    If omitted or null, false is used. */ @JsonProperty("experimental") @Nullable @@ -84,12 +63,17 @@ public ExperimentalSemconvConfigModel withExperimental(Boolean experimental) { } /** - * When true, also emit the previous major version alongside the target version. For version=1, - * the previous version refers to the pre-stable conventions that the instrumentation emitted - * before the first stable semantic convention version was defined. For version=2 and above, the - * previous version is the prior stable major version (e.g., version=2, dual_emit=true emits both - * v2 and v1). Enables dual-emit for phased migration between versions. If omitted or null, false - * is used. + * When true, also emit the previous major version alongside the target version. + * + *

    For version=1, the previous version refers to the pre-stable conventions that the + * instrumentation emitted before the first stable semantic convention version was defined. + * + *

    For version=2 and above, the previous version is the prior stable major version (e.g., + * version=2, dual_emit=true emits both v2 and v1). + * + *

    Enables dual-emit for phased migration between versions. + * + *

    If omitted or null, false is used. */ @JsonProperty("dual_emit") @Nullable diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerConfigModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerConfigModel.java index 5f5617695f8..ba29aed3148 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerConfigModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerConfigModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,14 +16,15 @@ @Generated("jsonschema2pojo") public class ExperimentalTracerConfigModel { - /** Configure if the tracer is enabled or not. If omitted, true is used. */ @JsonProperty("enabled") - @JsonPropertyDescription( - "Configure if the tracer is enabled or not.\nIf omitted, true is used.\n") @Nullable private Boolean enabled; - /** Configure if the tracer is enabled or not. If omitted, true is used. */ + /** + * Configure if the tracer is enabled or not. + * + *

    If omitted, true is used. + */ @JsonProperty("enabled") @Nullable public Boolean getEnabled() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerConfiguratorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerConfiguratorModel.java index b1095d8797d..933f72b8f21 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerConfiguratorModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerConfiguratorModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -22,12 +21,16 @@ public class ExperimentalTracerConfiguratorModel { @Nullable private ExperimentalTracerConfigModel defaultConfig; - /** Configure tracers. If omitted, all tracers use .default_config. */ @JsonProperty("tracers") - @JsonPropertyDescription("Configure tracers.\nIf omitted, all tracers use .default_config.\n") @Nullable private List tracers; + /** + * Configure the default tracer config used there is no matching entry in + * .tracer_configurator/development.tracers. + * + *

    If omitted, unmatched .tracers use default values as described in ExperimentalTracerConfig. + */ @JsonProperty("default_config") @Nullable public ExperimentalTracerConfigModel getDefaultConfig() { @@ -40,7 +43,11 @@ public ExperimentalTracerConfiguratorModel withDefaultConfig( return this; } - /** Configure tracers. If omitted, all tracers use .default_config. */ + /** + * Configure tracers. + * + *

    If omitted, all tracers use .default_config. + */ @JsonProperty("tracers") @Nullable public List getTracers() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerMatcherAndConfigModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerMatcherAndConfigModel.java index cc2933788d5..0194e477d6f 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerMatcherAndConfigModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalTracerMatcherAndConfigModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.annotation.Generated; import javax.annotation.Nullable; @@ -17,22 +16,10 @@ @Generated("jsonschema2pojo") public class ExperimentalTracerMatcherAndConfigModel { - /** - * Configure tracer names to match. Matching is case-sensitive, evaluated as follows: - * - *

    * If the tracer name exactly matches. * If the tracer name matches the wildcard pattern, - * where '?' matches any single character and '*' matches any number of characters including none. - * Property is required and must be non-null. - * - *

    (Required) - */ @JsonProperty("name") - @JsonPropertyDescription( - "Configure tracer names to match. Matching is case-sensitive, evaluated as follows:\n\n * If the tracer name exactly matches.\n * If the tracer name matches the wildcard pattern, where '?' matches any single character and '*' matches any number of characters including none.\nProperty is required and must be non-null.\n") @Nullable private String name; - /** (Required) */ @JsonProperty("config") @Nullable private ExperimentalTracerConfigModel config; @@ -40,11 +27,12 @@ public class ExperimentalTracerMatcherAndConfigModel { /** * Configure tracer names to match. Matching is case-sensitive, evaluated as follows: * - *

    * If the tracer name exactly matches. * If the tracer name matches the wildcard pattern, - * where '?' matches any single character and '*' matches any number of characters including none. - * Property is required and must be non-null. + *

    * If the tracer name exactly matches. * - *

    (Required) + *

    * If the tracer name matches the wildcard pattern, where '?' matches any single character + * and '*' matches any number of characters including none. + * + *

    Property is required and must be non-null. */ @JsonProperty("name") @Nullable @@ -57,7 +45,11 @@ public ExperimentalTracerMatcherAndConfigModel withName(String name) { return this; } - /** (Required) */ + /** + * The tracer config. + * + *

    Property is required and must be non-null. + */ @JsonProperty("config") @Nullable public ExperimentalTracerConfigModel getConfig() { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalUrlSanitizationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalUrlSanitizationModel.java index b31df745e78..c0fcbb2c109 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalUrlSanitizationModel.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalUrlSanitizationModel.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; import javax.annotation.Generated; @@ -18,27 +17,22 @@ @Generated("jsonschema2pojo") public class ExperimentalUrlSanitizationModel { - /** - * List of query parameter names whose values should be redacted from URLs. Query parameter names - * are case-sensitive. This is a full override of the default sensitive query parameter keys, it - * is not a list of keys in addition to the defaults. Set to an empty array to disable query - * parameter redaction. If omitted, the default sensitive query parameter list as defined by the - * url semantic conventions - * (https://github.com/open-telemetry/semantic-conventions/blob/main/docs/registry/attributes/url.md) - * is used. - */ @JsonProperty("sensitive_query_parameters") - @JsonPropertyDescription( - "List of query parameter names whose values should be redacted from URLs.\nQuery parameter names are case-sensitive.\nThis is a full override of the default sensitive query parameter keys, it is not a list of keys in addition to the defaults.\nSet to an empty array to disable query parameter redaction.\nIf omitted, the default sensitive query parameter list as defined by the url semantic conventions (https://github.com/open-telemetry/semantic-conventions/blob/main/docs/registry/attributes/url.md) is used.\n") @Nullable private List sensitiveQueryParameters; /** - * List of query parameter names whose values should be redacted from URLs. Query parameter names - * are case-sensitive. This is a full override of the default sensitive query parameter keys, it - * is not a list of keys in addition to the defaults. Set to an empty array to disable query - * parameter redaction. If omitted, the default sensitive query parameter list as defined by the - * url semantic conventions + * List of query parameter names whose values should be redacted from URLs. + * + *

    Query parameter names are case-sensitive. + * + *

    This is a full override of the default sensitive query parameter keys, it is not a list of + * keys in addition to the defaults. + * + *

    Set to an empty array to disable query parameter redaction. + * + *

    If omitted, the default sensitive query parameter list as defined by the url semantic + * conventions * (https://github.com/open-telemetry/semantic-conventions/blob/main/docs/registry/attributes/url.md) * is used. */