From ff8596d422ec5677aa122c10e4cad0f378e2fcfc Mon Sep 17 00:00:00 2001
From: Jack Berg <34418638+jack-berg@users.noreply.github.com>
Date: Wed, 15 Jul 2026 15:41:10 -0500
Subject: [PATCH] Replace jsonschema2pojo with hand rolled version
---
buildSrc/build.gradle.kts | 2 +-
.../gradle/js2p/ExperimentalPackages.java | 55 ---
.../js2p/OtelAdditionalPropertiesRule.java | 42 --
.../gradle/js2p/OtelEnumRule.java | 44 --
.../gradle/js2p/OtelJacksonAnnotator.java | 82 ---
.../gradle/js2p/OtelObjectRule.java | 140 ------
.../gradle/js2p/OtelPropertyRule.java | 161 ------
.../gradle/js2p/OtelRuleFactory.java | 72 ---
.../gradle/DeclarativeConfigPojoGenerator.kt | 465 ++++++++++++++++++
.../declarative-config/build.gradle.kts | 124 +----
.../AttributeListFactory.java | 5 +-
.../ComposableRuleBasedSamplerFactory.java | 20 +-
.../ExemplarFilterFactory.java | 8 +-
.../LoggerProviderFactory.java | 4 +-
.../MeterProviderFactory.java | 3 +-
.../model/AggregationModel.java | 2 +-
.../model/AlwaysOffSamplerModel.java | 4 +-
.../model/AlwaysOnSamplerModel.java | 4 +-
.../model/AttributeLimitsModel.java | 2 +-
.../model/AttributeNameValueModel.java | 57 +--
.../model/AttributeTypeModel.java | 57 +++
.../model/B3MultiPropagatorModel.java | 4 +-
.../model/B3PropagatorModel.java | 4 +-
.../model/BaggagePropagatorModel.java | 4 +-
...entialBucketHistogramAggregationModel.java | 2 +-
.../model/BatchLogRecordProcessorModel.java | 2 +-
.../model/BatchSpanProcessorModel.java | 2 +-
.../model/CardinalityLimitsModel.java | 2 +-
.../model/ConsoleExporterModel.java | 4 +-
.../model/ConsoleMetricExporterModel.java | 18 +-
.../model/DefaultAggregationModel.java | 4 +-
.../model/DistributionModel.java | 2 +-
.../model/DistributionPropertyModel.java | 2 +-
.../model/DropAggregationModel.java | 4 +-
.../model/ExemplarFilterModel.java | 52 ++
...plicitBucketHistogramAggregationModel.java | 2 +-
...orterDefaultHistogramAggregationModel.java | 51 ++
.../ExporterTemporalityPreferenceModel.java | 52 ++
.../declarativeconfig/model/GrpcTlsModel.java | 2 +-
.../declarativeconfig/model/HttpTlsModel.java | 2 +-
.../model/IdGeneratorModel.java | 2 +-
.../model/IdGeneratorPropertyModel.java | 2 +-
.../model/IncludeExcludeModel.java | 2 +-
.../model/InstrumentTypeModel.java | 56 +++
.../model/LastValueAggregationModel.java | 4 +-
.../model/LogRecordExporterModel.java | 2 +-
.../model/LogRecordExporterPropertyModel.java | 2 +-
.../model/LogRecordLimitsModel.java | 2 +-
.../model/LogRecordProcessorModel.java | 2 +-
.../LogRecordProcessorPropertyModel.java | 2 +-
.../model/LoggerProviderModel.java | 2 +-
.../model/MeterProviderModel.java | 52 +-
.../model/MetricProducerModel.java | 2 +-
.../model/MetricProducerPropertyModel.java | 2 +-
.../model/MetricReaderModel.java | 2 +-
.../model/NameStringValuePairModel.java | 2 +-
.../model/OpenCensusMetricProducerModel.java | 4 +-
.../OpenTelemetryConfigurationModel.java | 78 +--
.../model/OtlpGrpcExporterModel.java | 2 +-
.../model/OtlpGrpcMetricExporterModel.java | 18 +-
.../model/OtlpHttpEncodingModel.java | 51 ++
.../model/OtlpHttpExporterModel.java | 51 +-
.../model/OtlpHttpMetricExporterModel.java | 113 +----
.../model/ParentBasedSamplerModel.java | 2 +-
.../model/PeriodicMetricReaderModel.java | 2 +-
.../model/PropagatorModel.java | 2 +-
.../model/PullMetricExporterModel.java | 2 +-
.../PullMetricExporterPropertyModel.java | 2 +-
.../model/PullMetricReaderModel.java | 2 +-
.../model/PushMetricExporterModel.java | 2 +-
.../PushMetricExporterPropertyModel.java | 2 +-
.../model/RandomIdGeneratorModel.java | 4 +-
.../model/ResourceModel.java | 2 +-
.../declarativeconfig/model/SamplerModel.java | 2 +-
.../model/SamplerPropertyModel.java | 2 +-
.../model/SeverityNumberModel.java | 73 +++
.../model/SimpleLogRecordProcessorModel.java | 2 +-
.../model/SimpleSpanProcessorModel.java | 2 +-
.../model/SpanExporterModel.java | 2 +-
.../model/SpanExporterPropertyModel.java | 2 +-
.../{SpanKind.java => SpanKindModel.java} | 14 +-
.../model/SpanLimitsModel.java | 2 +-
.../model/SpanProcessorModel.java | 2 +-
.../model/SpanProcessorPropertyModel.java | 2 +-
.../model/SumAggregationModel.java | 4 +-
.../model/TextMapPropagatorModel.java | 2 +-
.../model/TextMapPropagatorPropertyModel.java | 2 +-
.../model/TraceContextPropagatorModel.java | 4 +-
.../model/TraceIdRatioBasedSamplerModel.java | 2 +-
.../model/TracerProviderModel.java | 2 +-
.../declarativeconfig/model/ViewModel.java | 2 +-
.../model/ViewSelectorModel.java | 56 +--
.../model/ViewStreamModel.java | 2 +-
.../ExperimentalCodeInstrumentationModel.java | 2 +-
...mentalComposableAlwaysOffSamplerModel.java | 4 +-
...imentalComposableAlwaysOnSamplerModel.java | 4 +-
...ComposableParentThresholdSamplerModel.java | 2 +-
...ntalComposableProbabilitySamplerModel.java | 2 +-
...mentalComposableRuleBasedSamplerModel.java | 2 +-
...asedSamplerRuleAttributePatternsModel.java | 2 +-
...eBasedSamplerRuleAttributeValuesModel.java | 2 +-
...alComposableRuleBasedSamplerRuleModel.java | 22 +-
.../ExperimentalComposableSamplerModel.java | 2 +-
...imentalComposableSamplerPropertyModel.java | 2 +-
...imentalContainerResourceDetectorModel.java | 4 +-
.../ExperimentalDbInstrumentationModel.java | 2 +-
...panEventBridgeLogRecordProcessorModel.java | 4 +-
...ExperimentalGenAiInstrumentationModel.java | 2 +-
...perimentalGeneralInstrumentationModel.java | 2 +-
...ExperimentalHostResourceDetectorModel.java | 4 +-
...imentalHttpClientInstrumentationModel.java | 2 +-
.../ExperimentalHttpInstrumentationModel.java | 2 +-
...imentalHttpServerInstrumentationModel.java | 2 +-
.../ExperimentalInstrumentationModel.java | 2 +-
.../ExperimentalJaegerRemoteSamplerModel.java | 2 +-
...lLanguageSpecificInstrumentationModel.java | 2 +-
...eSpecificInstrumentationPropertyModel.java | 2 +-
.../ExperimentalLoggerConfigModel.java | 19 +-
.../ExperimentalLoggerConfiguratorModel.java | 2 +-
...perimentalLoggerMatcherAndConfigModel.java | 2 +-
...rimentalMessagingInstrumentationModel.java | 2 +-
.../ExperimentalMeterConfigModel.java | 2 +-
.../ExperimentalMeterConfiguratorModel.java | 2 +-
...xperimentalMeterMatcherAndConfigModel.java | 2 +-
.../ExperimentalOtlpFileExporterModel.java | 2 +-
...perimentalOtlpFileMetricExporterModel.java | 32 +-
.../ExperimentalProbabilitySamplerModel.java | 2 +-
...erimentalProcessResourceDetectorModel.java | 4 +-
...rimentalPrometheusMetricExporterModel.java | 69 +--
...talPrometheusTranslationStrategyModel.java | 54 ++
.../ExperimentalResourceDetectionModel.java | 2 +-
.../ExperimentalResourceDetectorModel.java | 2 +-
...rimentalResourceDetectorPropertyModel.java | 2 +-
.../ExperimentalRpcInstrumentationModel.java | 2 +-
.../ExperimentalSanitizationModel.java | 2 +-
.../ExperimentalSemconvConfigModel.java | 2 +-
...erimentalServiceResourceDetectorModel.java | 4 +-
....java => ExperimentalSpanParentModel.java} | 16 +-
.../ExperimentalTracerConfigModel.java | 2 +-
.../ExperimentalTracerConfiguratorModel.java | 2 +-
...perimentalTracerMatcherAndConfigModel.java | 2 +-
.../ExperimentalUrlSanitizationModel.java | 2 +-
.../AttributeListFactoryTest.java | 29 +-
...ComposableRuleBasedSamplerFactoryTest.java | 25 +-
.../ExemplarFilterFactoryTest.java | 12 +-
.../InstrumentSelectorFactoryTest.java | 3 +-
.../LoggerProviderFactoryTest.java | 54 +-
.../MeterProviderFactoryTest.java | 3 +-
.../MetricExporterFactoryTest.java | 12 +-
.../MetricReaderFactoryTest.java | 7 +-
...rativeConfigurationCustomizerProvider.java | 5 +-
.../model/ModelEqualsHashCodeTest.java | 13 +-
.../model/ModelPackageBoundaryTest.java | 6 +-
settings.gradle.kts | 1 -
154 files changed, 1250 insertions(+), 1458 deletions(-)
delete mode 100644 buildSrc/src/main/java/io/opentelemetry/gradle/js2p/ExperimentalPackages.java
delete mode 100644 buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelAdditionalPropertiesRule.java
delete mode 100644 buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelEnumRule.java
delete mode 100644 buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelJacksonAnnotator.java
delete mode 100644 buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelObjectRule.java
delete mode 100644 buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelPropertyRule.java
delete mode 100644 buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelRuleFactory.java
create mode 100644 buildSrc/src/main/kotlin/io/opentelemetry/gradle/DeclarativeConfigPojoGenerator.kt
create mode 100644 sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeTypeModel.java
create mode 100644 sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExemplarFilterModel.java
create mode 100644 sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExporterDefaultHistogramAggregationModel.java
create mode 100644 sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExporterTemporalityPreferenceModel.java
create mode 100644 sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/InstrumentTypeModel.java
create mode 100644 sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpEncodingModel.java
create mode 100644 sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SeverityNumberModel.java
rename sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/{SpanKind.java => SpanKindModel.java} (69%)
create mode 100644 sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalPrometheusTranslationStrategyModel.java
rename sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/{ExperimentalSpanParent.java => ExperimentalSpanParentModel.java} (62%)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 439f512dd6e..2b3ba1b99ed 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -39,6 +39,7 @@ dependencies {
// When updating, update above in plugins too
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.8.0")
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.5.0")
+ implementation("com.fasterxml.jackson.core:jackson-databind:2.22.1")
implementation("com.squareup:javapoet:1.13.0")
implementation("com.squareup.wire:wire-compiler")
implementation("com.squareup.wire:wire-gradle-plugin")
@@ -49,7 +50,6 @@ dependencies {
implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.1.0")
implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.1.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21")
- implementation("org.jsonschema2pojo:jsonschema2pojo-core:1.3.3")
implementation("org.sonatype.gradle.plugins:scan-gradle-plugin:3.1.6")
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
}
diff --git a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/ExperimentalPackages.java b/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/ExperimentalPackages.java
deleted file mode 100644
index 6d6e40a1633..00000000000
--- a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/ExperimentalPackages.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.gradle.js2p;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.codemodel.JPackage;
-import org.jsonschema2pojo.rules.RuleFactory;
-
-/**
- * Routes generated types whose name starts with {@code Experimental} into an {@code internal}
- * sub-package.
- *
- * Declarative config exposes both stable and unstable (experimental) model types. Unstable types
- * are subject to breaking changes in minor versions, so they must live in an {@code internal}
- * package that is exempt from the stability guarantees in {@code VERSIONING.md}. Experimental types
- * are identified by the {@code Experimental} prefix, which is derived from the schema {@code title}
- * (see {@code useTitleAsClassname} in {@code build.gradle.kts}).
- *
- *
jsonschema2pojo generates every type into a single {@code targetPackage}. Both {@link
- * OtelObjectRule} and {@link OtelEnumRule} consult this helper before delegating to the stock rule
- * so the type is created in the correct package. Because the type is created in its final package,
- * codemodel resolves cross-package references and emits the necessary imports automatically.
- */
-final class ExperimentalPackages {
-
- private static final String EXPERIMENTAL_PREFIX = "Experimental";
- private static final String INTERNAL_SUBPACKAGE = "internal";
-
- private ExperimentalPackages() {}
-
- /**
- * Returns the package the type generated for {@code node} should be created in: the {@code
- * internal} sub-package for experimental types, the model root for everything else.
- *
- *
The routing is symmetric so that the package is determined purely by the {@code Experimental}
- * name prefix, regardless of the incoming {@code pkg}. This matters because jsonschema2pojo
- * creates {@code $ref} targets in the referrer's package context: a shared stable type (e.g. one
- * without a {@code title}, such as {@code SpanKind}) that is first referenced from inside an
- * experimental type would otherwise be pulled into {@code internal}. Forcing non-experimental
- * types back out keeps them in the public model package.
- */
- static JPackage resolve(RuleFactory ruleFactory, String nodeName, JsonNode node, JPackage pkg) {
- // getClassName applies the configured prefix/suffix and resolves the title-based name. The
- // Model suffix differs for enums, but the Experimental prefix (derived from the title or the
- // $def name) is present either way, which is all that matters for the routing decision.
- String className = ruleFactory.getNameHelper().getClassName(nodeName, node, pkg);
- boolean experimental = className.startsWith(EXPERIMENTAL_PREFIX);
- boolean inInternal = pkg.name().endsWith("." + INTERNAL_SUBPACKAGE);
- JPackage root = inInternal ? pkg.parent() : pkg;
- return experimental ? root.subPackage(INTERNAL_SUBPACKAGE) : root;
- }
-}
diff --git a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelAdditionalPropertiesRule.java b/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelAdditionalPropertiesRule.java
deleted file mode 100644
index 2c523226f59..00000000000
--- a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelAdditionalPropertiesRule.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.gradle.js2p;
-
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.codemodel.JDefinedClass;
-import com.sun.codemodel.JMethod;
-import org.jsonschema2pojo.Schema;
-import org.jsonschema2pojo.rules.AdditionalPropertiesRule;
-import org.jsonschema2pojo.rules.RuleFactory;
-
-/**
- * An {@link AdditionalPropertiesRule} that drops the generated {@code void setAdditionalProperty}
- * and moves {@code @JsonAnySetter} onto the identical-bodied {@code withAdditionalProperty}
- * builder, mirroring how regular properties expose only a {@code withX} mutator.
- */
-public class OtelAdditionalPropertiesRule extends AdditionalPropertiesRule {
-
- OtelAdditionalPropertiesRule(RuleFactory ruleFactory) {
- super(ruleFactory);
- }
-
- @Override
- public JDefinedClass apply(
- String nodeName, JsonNode node, JsonNode parent, JDefinedClass jclass, Schema schema) {
- JDefinedClass result = super.apply(nodeName, node, parent, jclass, schema);
-
- // Move @JsonAnySetter from the removed void setter onto the withX builder.
- result.methods().removeIf(method -> method.name().equals("setAdditionalProperty"));
- for (JMethod method : result.methods()) {
- if (method.name().equals("withAdditionalProperty")) {
- method.annotate(JsonAnySetter.class);
- break;
- }
- }
- return result;
- }
-}
diff --git a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelEnumRule.java b/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelEnumRule.java
deleted file mode 100644
index 4b84ff9832a..00000000000
--- a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelEnumRule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.gradle.js2p;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.codemodel.JClassContainer;
-import com.sun.codemodel.JPackage;
-import com.sun.codemodel.JType;
-import org.jsonschema2pojo.Schema;
-import org.jsonschema2pojo.rules.EnumRule;
-import org.jsonschema2pojo.rules.RuleFactory;
-
-/**
- * An {@link EnumRule} that routes top-level experimental enums into the {@code internal}
- * sub-package, mirroring {@link OtelObjectRule} for classes.
- *
- *
Only top-level enums (where the container is a {@link JPackage}) are routed. Nested enums are
- * created inside their owning class and move with it automatically.
- *
- *
Referenced from {@link OtelRuleFactory#getEnumRule()}.
- */
-public class OtelEnumRule extends EnumRule {
-
- private final RuleFactory ruleFactory;
-
- public OtelEnumRule(RuleFactory ruleFactory) {
- super(ruleFactory);
- this.ruleFactory = ruleFactory;
- }
-
- @Override
- public JType apply(
- String nodeName, JsonNode node, JsonNode parent, JClassContainer container, Schema schema) {
- if (container instanceof JPackage) {
- JPackage targetPackage =
- ExperimentalPackages.resolve(ruleFactory, nodeName, node, (JPackage) container);
- return super.apply(nodeName, node, parent, targetPackage, schema);
- }
- return super.apply(nodeName, node, parent, container, schema);
- }
-}
diff --git a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelJacksonAnnotator.java b/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelJacksonAnnotator.java
deleted file mode 100644
index 0e468638c08..00000000000
--- a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelJacksonAnnotator.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.gradle.js2p;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.codemodel.JAnnotationArrayMember;
-import com.sun.codemodel.JDefinedClass;
-import com.sun.codemodel.JFieldVar;
-import com.sun.codemodel.JMethod;
-import java.util.Iterator;
-import javax.annotation.Nullable;
-import org.jsonschema2pojo.AbstractAnnotator;
-
-/**
- * Replaces jsonschema2pojo's built-in Jackson annotator (disabled via {@code annotationStyle =
- * none}). Puts {@code @JsonProperty} on the getter — and, via {@link OtelPropertyRule}, on the
- * {@code withX} builder — rather than on the private field, so Jackson binds through the builder
- * instead of reflecting on the field. Fields carry only {@code @Nullable} for NullAway.
- *
- *
Only reproduces the {@code Jackson2Annotator} hooks these models use: no {@code
- * @JsonDeserialize}, {@code @JsonFormat}, or {@code @JsonTypeInfo} (no {@code Set}/date-time fields
- * or polymorphism).
- */
-public class OtelJacksonAnnotator extends AbstractAnnotator {
-
- @Override
- public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) {
- JAnnotationArrayMember value = clazz.annotate(JsonPropertyOrder.class).paramArray("value");
- for (Iterator names = propertiesNode.fieldNames(); names.hasNext(); ) {
- value.param(names.next());
- }
- }
-
- @Override
- public void propertyInclusion(JDefinedClass clazz, JsonNode schema) {
- clazz.annotate(JsonInclude.class).param("value", JsonInclude.Include.NON_NULL);
- }
-
- @Override
- public void propertyField(
- JFieldVar field, JDefinedClass clazz, String propertyName, JsonNode propertyNode) {
- // No @JsonProperty on the field; deserialization binds to the annotated withX (see
- // OtelPropertyRule).
- field.annotate(Nullable.class);
- }
-
- @Override
- public void propertyGetter(JMethod getter, JDefinedClass clazz, String propertyName) {
- getter.annotate(JsonProperty.class).param("value", propertyName);
- getter.annotate(Nullable.class);
- }
-
- @Override
- public void anyGetter(JMethod getter, JDefinedClass clazz) {
- getter.annotate(JsonAnyGetter.class);
- }
-
- @Override
- public void anySetter(JMethod setter, JDefinedClass clazz) {
- setter.annotate(JsonAnySetter.class);
- }
-
- @Override
- public void enumCreatorMethod(JDefinedClass enumClass, JMethod creatorMethod) {
- creatorMethod.annotate(JsonCreator.class);
- }
-
- @Override
- public void enumValueMethod(JDefinedClass enumClass, JMethod valueMethod) {
- valueMethod.annotate(JsonValue.class);
- }
-}
diff --git a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelObjectRule.java b/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelObjectRule.java
deleted file mode 100644
index ba708c98892..00000000000
--- a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelObjectRule.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.gradle.js2p;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.codemodel.ClassType;
-import com.sun.codemodel.JBlock;
-import com.sun.codemodel.JCodeModel;
-import com.sun.codemodel.JDefinedClass;
-import com.sun.codemodel.JExpr;
-import com.sun.codemodel.JFieldVar;
-import com.sun.codemodel.JMethod;
-import com.sun.codemodel.JMod;
-import com.sun.codemodel.JPackage;
-import com.sun.codemodel.JType;
-import com.sun.codemodel.JVar;
-import javax.annotation.Nullable;
-import org.jsonschema2pojo.Schema;
-import org.jsonschema2pojo.rules.ObjectRule;
-import org.jsonschema2pojo.rules.RuleFactory;
-import org.jsonschema2pojo.util.ParcelableHelper;
-import org.jsonschema2pojo.util.ReflectionHelper;
-
-/**
- * An {@link ObjectRule} that routes experimental classes into the {@code internal} sub-package and
- * replaces jsonschema2pojo's generated {@code toString}/{@code equals}/{@code hashCode} with
- * implementations that mirror AutoValue's style.
- */
-public class OtelObjectRule extends ObjectRule {
-
- private final RuleFactory ruleFactory;
-
- public OtelObjectRule(
- RuleFactory ruleFactory,
- ParcelableHelper parcelableHelper,
- ReflectionHelper reflectionHelper) {
- super(ruleFactory, parcelableHelper, reflectionHelper);
- this.ruleFactory = ruleFactory;
- }
-
- @Override
- public JType apply(
- String nodeName, JsonNode node, JsonNode parent, JPackage pkg, Schema schema) {
- // Route experimental types into the internal sub-package before the class is created.
- JPackage targetPackage = ExperimentalPackages.resolve(ruleFactory, nodeName, node, pkg);
- JType type = super.apply(nodeName, node, parent, targetPackage, schema);
- if (type instanceof JDefinedClass
- && ((JDefinedClass) type).getClassType() == ClassType.CLASS) {
- addValueMethods((JDefinedClass) type);
- }
- return type;
- }
-
- private static void addValueMethods(JDefinedClass clazz) {
- JCodeModel model = clazz.owner();
-
- addToString(clazz, model);
- addHashCode(clazz, model);
- addEquals(clazz, model);
- }
-
- // toString: ClassName{field1=value1, field2=value2}
- private static void addToString(JDefinedClass clazz, JCodeModel model) {
- JMethod toString = clazz.method(JMod.PUBLIC, model.ref(String.class), "toString");
- toString.annotate(Override.class);
-
- StringBuilder expr = new StringBuilder("return \"").append(clazz.name()).append("{\"");
- boolean first = true;
- for (JFieldVar field : clazz.fields().values()) {
- if (isStatic(field)) {
- continue;
- }
- expr.append(" + \"")
- .append(first ? "" : ", ")
- .append(field.name())
- .append("=\" + ")
- .append(field.name());
- first = false;
- }
- expr.append(" + \"}\";");
- toString.body().directStatement(expr.toString());
- }
-
- // equals: instanceof + cast + (this.f == null ? that.f == null : this.f.equals(that.f)) && ...
- private static void addEquals(JDefinedClass clazz, JCodeModel model) {
- JMethod equals = clazz.method(JMod.PUBLIC, model.BOOLEAN, "equals");
- equals.annotate(Override.class);
- JVar other = equals.param(model.ref(Object.class), "o");
- other.annotate(Nullable.class);
- JBlock body = equals.body();
-
- body._if(other.eq(JExpr._this()))._then()._return(JExpr.TRUE);
-
- JBlock matched = body._if(other._instanceof(clazz))._then();
- matched.directStatement(clazz.name() + " that = (" + clazz.name() + ") o;");
-
- StringBuilder comparison = new StringBuilder("return ");
- boolean first = true;
- for (JFieldVar field : clazz.fields().values()) {
- if (isStatic(field)) {
- continue;
- }
- String name = field.name();
- comparison
- .append(first ? "" : " && ")
- .append("(this.").append(name).append(" == null ? that.").append(name)
- .append(" == null : this.").append(name).append(".equals(that.").append(name)
- .append("))");
- first = false;
- }
- matched.directStatement(first ? "return true;" : comparison.append(";").toString());
-
- body._return(JExpr.FALSE);
- }
-
- // hashCode: h = 1; h *= 1000003; h ^= (f == null ? 0 : f.hashCode()); ...
- private static void addHashCode(JDefinedClass clazz, JCodeModel model) {
- JMethod hashCode = clazz.method(JMod.PUBLIC, model.INT, "hashCode");
- hashCode.annotate(Override.class);
- JBlock body = hashCode.body();
- JVar h = body.decl(model.INT, "h", JExpr.lit(1));
-
- for (JFieldVar field : clazz.fields().values()) {
- if (isStatic(field)) {
- continue;
- }
- String name = field.name();
- body.directStatement("h *= 1000003;");
- body.directStatement("h ^= (this." + name + " == null) ? 0 : this." + name + ".hashCode();");
- }
- body._return(h);
- }
-
- private static boolean isStatic(JFieldVar field) {
- return (field.mods().getValue() & JMod.STATIC) == JMod.STATIC;
- }
-}
diff --git a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelPropertyRule.java b/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelPropertyRule.java
deleted file mode 100644
index d16cb8bc030..00000000000
--- a/buildSrc/src/main/java/io/opentelemetry/gradle/js2p/OtelPropertyRule.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.gradle.js2p;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
-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, and
- * annotates the generated {@code withX} builder method with {@code @JsonProperty}.
- *
- * 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.
- *
- *
{@link OtelJacksonAnnotator} puts {@code @JsonProperty} on the getter, but has no hook for the
- * {@code withX} builder methods, so this rule annotates them.
- */
-public class OtelPropertyRule extends PropertyRule {
-
- 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;
- }
-
- // A $ref target with its own top-level description would land on the field via DescriptionRule
- // and conflict with the sibling description we re-apply to the getter. The schema puts
- // descriptions on properties, not $defs, so this doesn't happen today; fail loud if it does.
- if (referencedTypeHasDescription(node, schema)) {
- throw new GenerationException(
- "Property '"
- + nodeName
- + "' resolves to a type that defines its own top-level description, which is not"
- + " handled (it would land on the field). See "
- + OtelPropertyRule.class.getName()
- + ".");
- }
-
- annotateBuilderMethod(result, propertyName, node, nodeName);
-
- if (description != null) {
- applyGetterDescription(nodeName, node, schema, result, propertyName, field, description);
- }
- return result;
- }
-
- /** Binds Jackson to withX so deserialization goes through the builder, not the private field. */
- private void annotateBuilderMethod(
- JDefinedClass jclass, String propertyName, JsonNode node, String jsonName) {
- String builderName = ruleFactory.getNameHelper().getBuilderName(propertyName, node);
- for (JMethod method : jclass.methods()) {
- if (method.name().equals(builderName)) {
- method.annotate(JsonProperty.class).param("value", jsonName);
- return;
- }
- }
- }
-
- /**
- * Returns whether a (possibly chained) {@code $ref} resolves to a schema with its own
- * description. Uses {@link org.jsonschema2pojo.SchemaStore} rather than inspecting {@code
- * field.javadoc()} (which would instantiate an empty comment).
- */
- private boolean referencedTypeHasDescription(JsonNode node, Schema schema) {
- JsonNode current = node;
- Schema currentSchema = schema;
- boolean resolved = false;
- while (current.has("$ref")) {
- currentSchema =
- ruleFactory
- .getSchemaStore()
- .create(
- currentSchema,
- current.get("$ref").asText(),
- ruleFactory.getGenerationConfig().getRefFragmentPathDelimiters());
- current = currentSchema.getContent();
- resolved = true;
- }
- return resolved && current.has("description");
- }
-
- 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} — emits property descriptions on getters only (restoring those
- * written as {@code $ref} siblings, which jsonschema2pojo drops) and annotates the {@code
- * withX} builder methods with {@code @JsonProperty}.
- * {@link OtelAdditionalPropertiesRule} — removes the redundant {@code setAdditionalProperty},
- * moving {@code @JsonAnySetter} onto {@code withAdditionalProperty}.
- *
- *
- * Referenced from {@code sdk-extensions/declarative-config/build.gradle.kts} via {@code
- * jsonSchema2Pojo.customRuleFactory}.
- */
-public class OtelRuleFactory extends RuleFactory {
-
- @Override
- public Rule getObjectRule() {
- return new OtelObjectRule(this, new ParcelableHelper(), getReflectionHelper());
- }
-
- @Override
- public Rule getEnumRule() {
- return new OtelEnumRule(this);
- }
-
- @Override
- public Rule getPropertyRule() {
- return new OtelPropertyRule(this);
- }
-
- @Override
- public Rule getAdditionalPropertiesRule() {
- return new OtelAdditionalPropertiesRule(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/buildSrc/src/main/kotlin/io/opentelemetry/gradle/DeclarativeConfigPojoGenerator.kt b/buildSrc/src/main/kotlin/io/opentelemetry/gradle/DeclarativeConfigPojoGenerator.kt
new file mode 100644
index 00000000000..a7dd033aafc
--- /dev/null
+++ b/buildSrc/src/main/kotlin/io/opentelemetry/gradle/DeclarativeConfigPojoGenerator.kt
@@ -0,0 +1,465 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.gradle
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.ObjectMapper
+import java.io.File
+
+/**
+ * POJO generator for the declarative-config model package. Reads the opentelemetry-configuration
+ * JSON Schema and emits Java source files directly.
+ *
+ * Design notes:
+ * - All schema types (object types and enums) get a "Model" suffix.
+ * - All enums are top-level files — not nested inner classes — regardless of how many schema types
+ * reference them. Cross-model references import the enum type and use its simple name.
+ * - "Experimental*" types go into the model.internal sub-package.
+ * - Properties with object-typed additionalProperties get a synthetic "*PropertyModel" companion
+ * class. When additionalProperties is boolean true (root schema) Map is used
+ * directly.
+ * - All $refs are local (#/$defs/...).
+ */
+class DeclarativeConfigPojoGenerator(
+ private val schemaFile: File,
+ private val outputDir: File,
+ private val modelPackage: String,
+) {
+ private val internalPackage = "$modelPackage.internal"
+ private val mapper = ObjectMapper()
+ private lateinit var defs: Map
+ private lateinit var enumDefNames: Set
+ private lateinit var extensibleDefNames: Set
+
+ // Carries resolved type information for a single property.
+ private data class ResolvedType(val expr: String, val imports: Set = emptySet())
+
+ // Carries all derived information about one schema property.
+ private data class FieldInfo(
+ val jsonKey: String,
+ val javaField: String,
+ val getter: String,
+ val builder: String,
+ val typeExpr: String,
+ val typeImports: Set,
+ val description: String?,
+ )
+
+ fun generate() {
+ val schema = mapper.readTree(schemaFile)
+ defs = schema["\$defs"]?.properties()?.associate { it.key to it.value } ?: emptyMap()
+
+ enumDefNames = defs.entries.filter { (_, node) -> node.has("enum") }.map { it.key }.toSet()
+ extensibleDefNames = defs.entries
+ .filter { (_, node) -> node["additionalProperties"]?.let { !it.isBoolean && it.isObject } == true }
+ .map { it.key }
+ .toSet()
+
+ // Generate root schema as OpenTelemetryConfigurationModel.
+ val rootTitle = schema["title"]?.asText() ?: error("Root schema has no title")
+ generateClassFile(rootTitle, schema)
+
+ for ((defName, defNode) in defs) {
+ if (defNode.has("enum")) generateEnumFile(defName, defNode)
+ else generateClassFile(defName, defNode)
+ }
+ }
+
+ // ── Naming ──────────────────────────────────────────────────────────────────
+
+ private fun isExperimental(schemaKey: String) = schemaKey.startsWith("Experimental")
+
+ private fun packageForKey(schemaKey: String) =
+ if (isExperimental(schemaKey)) internalPackage else modelPackage
+
+ private fun classNameForKey(key: String) = "${key}Model"
+
+ private fun javaTypeForRef(defKey: String) = classNameForKey(defKey)
+
+ // ── Property name conversion ─────────────────────────────────────────────────
+
+ /**
+ * Maps a JSON property name (snake_case, may contain "/") to a Java field name.
+ * "default" → "_default" (reserved keyword); "foo_bar/baz" → "fooBarBaz".
+ */
+ private fun fieldName(jsonKey: String): String {
+ val raw = jsonKey
+ .split("_", "/")
+ .mapIndexed { i, part -> if (i == 0) part else part.replaceFirstChar { it.uppercase() } }
+ .joinToString("")
+ return if (raw == "default") "_default" else raw
+ }
+
+ /**
+ * The base name used to build getter/builder names. Strips the leading underscore from
+ * "_default" so the methods are "getDefault"/"withDefault", not "get_default".
+ */
+ private fun baseNameFor(jsonKey: String): String {
+ val field = fieldName(jsonKey)
+ return if (field == "_default") "default" else field
+ }
+
+ private fun getterName(jsonKey: String) =
+ "get${baseNameFor(jsonKey).replaceFirstChar { it.uppercase() }}"
+
+ private fun builderName(jsonKey: String) =
+ "with${baseNameFor(jsonKey).replaceFirstChar { it.uppercase() }}"
+
+ // ── Type resolution ──────────────────────────────────────────────────────────
+
+ private fun resolvePropertyType(propNode: JsonNode, fromPackage: String): ResolvedType {
+ val ref = propNode["\$ref"]?.asText()
+ if (ref != null) return resolveDefRef(ref.removePrefix("#/\$defs/"), fromPackage)
+
+ if (isArrayType(propNode["type"])) return resolveArrayType(propNode["items"], fromPackage)
+
+ if (propNode.has("oneOf")) return ResolvedType("Object")
+
+ for (kw in listOf("anyOf", "allOf", "if")) {
+ if (propNode.has(kw)) error(
+ "Unhandled schema keyword \"$kw\" encountered during generation. " +
+ "Update the generator to handle this construct. Property node: $propNode"
+ )
+ }
+
+ return resolveScalarType(propNode["type"])
+ }
+
+ private fun resolveDefRef(defKey: String, fromPackage: String): ResolvedType {
+ val defPkg = packageForKey(defKey)
+ val simple = javaTypeForRef(defKey)
+ return if (defPkg == fromPackage) ResolvedType(simple)
+ else ResolvedType(simple, setOf("$defPkg.$simple"))
+ }
+
+ private fun resolveArrayType(itemsNode: JsonNode?, fromPackage: String): ResolvedType {
+ if (itemsNode == null) error(
+ "Array property has no \"items\" schema: cannot determine element type. " +
+ "Update the generator to handle this construct."
+ )
+
+ val ref = itemsNode["\$ref"]?.asText()
+ if (ref != null) {
+ val inner = resolveDefRef(ref.removePrefix("#/\$defs/"), fromPackage)
+ return ResolvedType("List<${inner.expr}>", inner.imports + "java.util.List")
+ }
+
+ val javaType = when (itemsNode["type"]?.asText()) {
+ "string" -> "String"
+ "number" -> "Double"
+ "integer" -> "Integer"
+ "boolean" -> "Boolean"
+ else -> error(
+ "Unhandled array items type \"${itemsNode["type"]?.asText()}\" encountered during generation. " +
+ "Update the generator to handle this type. Items node: $itemsNode"
+ )
+ }
+ return ResolvedType("List<$javaType>", setOf("java.util.List"))
+ }
+
+ private fun resolveScalarType(typeNode: JsonNode?): ResolvedType {
+ if (typeNode == null) error(
+ "Property has no \$ref, type, oneOf, anyOf, allOf, or if: cannot determine Java type. " +
+ "Update the generator to handle this construct."
+ )
+ val types = if (typeNode.isArray) typeNode.map { it.asText() } else listOf(typeNode.asText())
+ return when (types.firstOrNull { it != "null" }) {
+ "string" -> ResolvedType("String")
+ "integer" -> ResolvedType("Integer")
+ "boolean" -> ResolvedType("Boolean")
+ "number" -> ResolvedType("Double")
+ else -> error(
+ "Unhandled scalar type(s) $types encountered during generation. " +
+ "Update the generator to handle this type."
+ )
+ }
+ }
+
+ /** Returns true if the type node represents an array (scalar or array-of-types form). */
+ private fun isArrayType(typeNode: JsonNode?): Boolean {
+ if (typeNode == null) return false
+ return typeNode.asText() == "array" || (typeNode.isArray && typeNode.any { it.asText() == "array" })
+ }
+
+ // ── File generation ──────────────────────────────────────────────────────────
+
+ private fun generateEnumFile(defKey: String, defNode: JsonNode) {
+ val className = classNameForKey(defKey)
+ val pkg = packageForKey(defKey)
+ val values = defNode["enum"].map { it.asText() }
+ writeFile(pkg, className, buildEnumSource(pkg, className, values))
+ }
+
+ private fun generateClassFile(defKey: String, defNode: JsonNode) {
+ val className = classNameForKey(defKey)
+ val pkg = packageForKey(defKey)
+ val isExtensible = defKey in extensibleDefNames
+ val hasOpenAdditionalProperties = defNode["additionalProperties"]?.isBoolean == true &&
+ defNode["additionalProperties"].asBoolean()
+
+ writeFile(pkg, className, buildClassSource(pkg, className, defKey, defNode, isExtensible, hasOpenAdditionalProperties))
+
+ if (isExtensible) {
+ val propClassName = "${defKey}PropertyModel"
+ writeFile(pkg, propClassName, buildPropertyModelSource(pkg, propClassName))
+ }
+ }
+
+ private fun writeFile(pkg: String, className: String, content: String) {
+ val pkgDir = outputDir.resolve(pkg.replace('.', '/'))
+ pkgDir.mkdirs()
+ pkgDir.resolve("$className.java").writeText(content)
+ }
+
+ // ── Source builders ──────────────────────────────────────────────────────────
+
+ private fun buildEnumSource(pkg: String, className: String, values: List) = buildString {
+ val constants = values.map { it.toScreamingSnakeCase() to it }
+
+ appendLicense()
+ append("\npackage $pkg;\n\n")
+ append("import com.fasterxml.jackson.annotation.JsonCreator;\n")
+ append("import com.fasterxml.jackson.annotation.JsonValue;\n")
+ append("import java.util.HashMap;\n")
+ append("import java.util.Map;\n")
+ append("import javax.annotation.Generated;\n")
+ append("\n@Generated(\"io.opentelemetry.gradle.DeclarativeConfigPojoGenerator\")\n")
+ append("public enum $className {\n")
+
+ constants.forEachIndexed { i, (name, value) ->
+ val terminator = if (i < constants.size - 1) "," else ";"
+ append(" $name(\"$value\")$terminator\n")
+ }
+
+ append(" private final String value;\n")
+ append(" private static final Map CONSTANTS = new HashMap();\n\n")
+ append(" static {\n for ($className c : values()) {\n CONSTANTS.put(c.value, c);\n }\n }\n\n")
+ append(" $className(String value) {\n this.value = value;\n }\n\n")
+ append(" @Override\n public String toString() {\n return this.value;\n }\n\n")
+ append(" @JsonValue\n public String value() {\n return this.value;\n }\n\n")
+ append(" @JsonCreator\n public static $className fromValue(String value) {\n")
+ append(" $className constant = CONSTANTS.get(value);\n")
+ append(" if (constant == null) {\n throw new IllegalArgumentException(value);\n")
+ append(" } else {\n return constant;\n }\n }\n}\n")
+ }
+
+ private fun buildClassSource(
+ pkg: String,
+ className: String,
+ defKey: String,
+ defNode: JsonNode,
+ isExtensible: Boolean,
+ hasOpenAdditionalProperties: Boolean,
+ ) = buildString {
+ val properties = defNode["properties"]?.properties()?.toList() ?: emptyList()
+
+ val fields = properties.map { (jsonKey, propNode) ->
+ val resolved = resolvePropertyType(propNode, pkg)
+ FieldInfo(
+ jsonKey = jsonKey,
+ javaField = fieldName(jsonKey),
+ getter = getterName(jsonKey),
+ builder = builderName(jsonKey),
+ typeExpr = resolved.expr,
+ typeImports = resolved.imports,
+ description = propNode["description"]?.asText(),
+ )
+ }
+
+ val companionName = if (isExtensible) "${defKey}PropertyModel" else null
+ val additionalPropsType = when {
+ isExtensible -> "Map"
+ hasOpenAdditionalProperties -> "Map"
+ else -> null
+ }
+
+ val imports = sortedSetOf(
+ "com.fasterxml.jackson.annotation.JsonInclude",
+ "com.fasterxml.jackson.annotation.JsonPropertyOrder",
+ "javax.annotation.Generated",
+ "javax.annotation.Nullable",
+ )
+ if (fields.any { it.typeExpr.startsWith("List<") }) imports.add("java.util.List")
+ if (additionalPropsType != null) {
+ imports.addAll(listOf(
+ "java.util.LinkedHashMap",
+ "java.util.Map",
+ "com.fasterxml.jackson.annotation.JsonAnyGetter",
+ "com.fasterxml.jackson.annotation.JsonAnySetter",
+ ))
+ }
+ if (fields.isNotEmpty()) imports.add("com.fasterxml.jackson.annotation.JsonProperty")
+ for (f in fields) imports.addAll(f.typeImports)
+
+ appendLicense()
+ append("\npackage $pkg;\n\n")
+ for (imp in imports) append("import $imp;\n")
+ append("\n@JsonInclude(JsonInclude.Include.NON_NULL)\n")
+
+ val propKeys = properties.map { "\"${it.key}\"" }
+ if (propKeys.isEmpty()) {
+ append("@JsonPropertyOrder({})\n")
+ } else {
+ append("@JsonPropertyOrder({\n")
+ propKeys.forEachIndexed { i, k ->
+ append(" $k${if (i < propKeys.size - 1) "," else ""}\n")
+ }
+ append("})\n")
+ }
+
+ append("@Generated(\"io.opentelemetry.gradle.DeclarativeConfigPojoGenerator\")\n")
+ append("public class $className {\n\n")
+
+ // Fields
+ for (f in fields) append(" @Nullable private ${f.typeExpr} ${f.javaField};\n")
+ if (additionalPropsType != null) {
+ val init = if (isExtensible) "new LinkedHashMap()"
+ else "new LinkedHashMap()"
+ append(" private $additionalPropsType additionalProperties = $init;\n")
+ }
+ if (fields.isNotEmpty() || additionalPropsType != null) append("\n")
+
+ // Getters and builders (all fields are nullable)
+ for (f in fields) {
+ if (f.description != null) {
+ append(" /**\n")
+ for (line in formatJavadoc(f.description)) append(" * $line\n")
+ append(" */\n")
+ }
+ append(" @JsonProperty(\"${f.jsonKey}\")\n")
+ append(" @Nullable\n")
+ append(" public ${f.typeExpr} ${f.getter}() {\n return ${f.javaField};\n }\n\n")
+ append(" @JsonProperty(\"${f.jsonKey}\")\n")
+ append(" public $className ${f.builder}(${f.typeExpr} ${f.javaField}) {\n")
+ append(" this.${f.javaField} = ${f.javaField};\n return this;\n }\n\n")
+ }
+
+ // additionalProperties getter/builder
+ if (additionalPropsType != null) {
+ val apValueType = companionName ?: "Object"
+ append(" @JsonAnyGetter\n")
+ append(" public $additionalPropsType getAdditionalProperties() {\n return this.additionalProperties;\n }\n\n")
+ append(" @JsonAnySetter\n")
+ append(" public $className withAdditionalProperty(String name, $apValueType value) {\n")
+ append(" this.additionalProperties.put(name, value);\n return this;\n }\n\n")
+ }
+
+ val allFields = fields.map { it.javaField } +
+ (if (additionalPropsType != null) listOf("additionalProperties") else emptyList())
+
+ appendToString(className, allFields)
+ append("\n")
+ appendHashCode(allFields)
+ append("\n")
+ appendEquals(className, allFields)
+ append("}\n")
+ }
+
+ private fun buildPropertyModelSource(pkg: String, className: String) = buildString {
+ appendLicense()
+ append("\npackage $pkg;\n\n")
+ append("import com.fasterxml.jackson.annotation.JsonAnyGetter;\n")
+ append("import com.fasterxml.jackson.annotation.JsonAnySetter;\n")
+ append("import com.fasterxml.jackson.annotation.JsonInclude;\n")
+ append("import com.fasterxml.jackson.annotation.JsonPropertyOrder;\n")
+ append("import java.util.LinkedHashMap;\n")
+ append("import java.util.Map;\n")
+ append("import javax.annotation.Generated;\n")
+ append("import javax.annotation.Nullable;\n")
+ append("\n@JsonInclude(JsonInclude.Include.NON_NULL)\n")
+ append("@JsonPropertyOrder({})\n")
+ append("@Generated(\"io.opentelemetry.gradle.DeclarativeConfigPojoGenerator\")\n")
+ append("public class $className {\n\n")
+ append(" private Map additionalProperties = new LinkedHashMap();\n\n")
+ append(" @JsonAnyGetter\n")
+ append(" public Map getAdditionalProperties() {\n return this.additionalProperties;\n }\n\n")
+ append(" @JsonAnySetter\n")
+ append(" public $className withAdditionalProperty(String name, Object value) {\n")
+ append(" this.additionalProperties.put(name, value);\n return this;\n }\n\n")
+ appendToString(className, listOf("additionalProperties"))
+ append("\n")
+ appendHashCode(listOf("additionalProperties"))
+ append("\n")
+ appendEquals(className, listOf("additionalProperties"))
+ append("}\n")
+ }
+
+ // ── Shared method emitters ───────────────────────────────────────────────────
+
+ private fun StringBuilder.appendToString(className: String, fields: List) {
+ append(" @Override\n public String toString() {\n")
+ if (fields.isEmpty()) {
+ append(" return \"$className{}\";\n")
+ } else {
+ val parts = fields.mapIndexed { i, name ->
+ if (i == 0) "\"$name=\" + $name" else "\", $name=\" + $name"
+ }
+ append(" return \"$className{\" + ${parts.joinToString(" + ")} + \"}\";\n")
+ }
+ append(" }\n")
+ }
+
+ private fun StringBuilder.appendHashCode(fields: List) {
+ append(" @Override\n public int hashCode() {\n int h = 1;\n")
+ for (name in fields) {
+ append(" h *= 1000003;\n")
+ append(" h ^= (this.$name == null) ? 0 : this.$name.hashCode();\n")
+ }
+ append(" return h;\n }\n")
+ }
+
+ private fun StringBuilder.appendEquals(className: String, fields: List) {
+ append(" @Override\n public boolean equals(@Nullable Object o) {\n")
+ append(" if (o == this) {\n return true;\n }\n")
+ append(" if (o instanceof $className) {\n $className that = ($className) o;\n")
+ if (fields.isEmpty()) {
+ append(" return true;\n")
+ } else {
+ val conditions = fields.map { "(this.$it == null ? that.$it == null : this.$it.equals(that.$it))" }
+ append(" return ${conditions.joinToString("\n && ")};\n")
+ }
+ append(" }\n return false;\n }\n")
+ }
+
+ // ── Helpers ──────────────────────────────────────────────────────────────────
+
+ /**
+ * Converts a JSON enum value to a Java SCREAMING_SNAKE_CASE constant name.
+ * Splits on "_", "/", "-", and letter-digit boundaries.
+ * e.g. "trace2" → "TRACE_2", "no_utf8_escaping/development" → "NO_UTF_8_ESCAPING_DEVELOPMENT"
+ */
+ private fun String.toScreamingSnakeCase() = this
+ .replace("/", "_")
+ .replace("-", "_")
+ .replace(Regex("([a-zA-Z])(\\d)"), "$1_$2")
+ .replace(Regex("(\\d)([a-zA-Z])"), "$1_$2")
+ .split("_")
+ .joinToString("_") { it.uppercase() }
+
+ /**
+ * Formats a schema description string into javadoc lines. Each newline in the schema becomes a
+ * paragraph break so google-java-format doesn't collapse them into one line.
+ */
+ private fun formatJavadoc(description: String): List {
+ val lines = description.trimEnd('\n').split('\n')
+ if (lines.size == 1) return lines
+ return buildList {
+ lines.forEachIndexed { i, line ->
+ when {
+ i == 0 -> add(line)
+ // Empty lines arise from \n\n paragraph breaks in the schema. Skip them: the next
+ // non-empty line will open its own , so the empty string itself gets no tag.
+ line.isEmpty() -> Unit
+ else -> { add(""); add("
$line") }
+ }
+ }
+ }
+ }
+
+ private fun StringBuilder.appendLicense() {
+ append("/*\n * Copyright The OpenTelemetry Authors\n * SPDX-License-Identifier: Apache-2.0\n */\n")
+ }
+}
diff --git a/sdk-extensions/declarative-config/build.gradle.kts b/sdk-extensions/declarative-config/build.gradle.kts
index 3971acd71ab..b55cb460122 100644
--- a/sdk-extensions/declarative-config/build.gradle.kts
+++ b/sdk-extensions/declarative-config/build.gradle.kts
@@ -1,4 +1,5 @@
import de.undercouch.gradle.tasks.download.Download
+import io.opentelemetry.gradle.DeclarativeConfigPojoGenerator
plugins {
id("otel.java-conventions")
@@ -7,7 +8,6 @@ plugins {
id("otel.animalsniffer-conventions")
id("de.undercouch.download")
- id("org.jsonschema2pojo")
}
description = "OpenTelemetry SDK Declarative Config"
@@ -50,13 +50,11 @@ dependencies {
testImplementation("nl.jqno.equalsverifier:equalsverifier")
}
-// The following tasks download the JSON Schema files from open-telemetry/opentelemetry-configuration,
-// generate POJOs, and write the post-processed result into src/main/java for version control.
-// The sequence of tasks is:
+// The following tasks download the JSON Schema files from open-telemetry/opentelemetry-configuration
+// and regenerate the committed model POJOs in src/main/java. The sequence is:
// 1. downloadConfigurationSchema - download configuration schema from open-telemetry/opentelemetry-configuration
-// 2. unzipConfigurationSchema - unzip the configuration schema archive contents to $buildDir/configuration/
-// 3. generateJsonSchema2Pojo - generate java POJOs from the configuration schema
-// 4. syncPojoModelsToSrc - post-process the generated POJOs and write them to src/main/java
+// 2. unzipConfigurationSchema - unzip the schema archive to $buildDir/configuration/
+// 3. syncPojoModelsToSrc - run PojoGenerator to write Java sources into src/main/java
// The generated POJOs are committed to src/main/java and are NOT regenerated as part of the normal build.
// To regenerate (e.g. after a schema update), run: ./gradlew :sdk-extensions:declarative-config:syncPojoModelsToSrc
@@ -93,92 +91,25 @@ val unzipConfigurationSchema = tasks.register("unzipConfigurationSchema")
includeEmptyDirs = false
}
-jsonSchema2Pojo {
- sourceFiles = setOf(file("$buildDirectory/configuration/opentelemetry_configuration.json"))
- targetDirectory = file("$buildDirectory/generated/sources/js2p/java/main")
- targetPackage = "io.opentelemetry.sdk.autoconfigure.declarativeconfig.model"
-
- // Clear old source files to avoid contaminated source dir when updating
- removeOldOutput = true
-
- // OtelJacksonAnnotator drives Jackson annotations (annotationStyle = none disables the built-in
- // one); puts @JsonProperty on getters/withX builders instead of private fields. JSR-305 stays off
- // so @Nullable comes only from OtelJacksonAnnotator.
- includeJsr305Annotations = false
- setAnnotationStyle("none")
- setCustomAnnotator(io.opentelemetry.gradle.js2p.OtelJacksonAnnotator::class.java)
-
- // Generate AutoValue-style toString/equals/hashCode via OtelObjectRule (wired through
- // OtelRuleFactory) rather than jsonschema2pojo's defaults. The defaults use a commons-style
- // toString (System.identityHashCode) and compare boxed fields with == (tripping ErrorProne's
- // BoxedPrimitiveEquality). Disable the built-in generation so the custom rule can supply its own.
- includeToString = false
- includeHashcodeAndEquals = false
- setCustomRuleFactory(io.opentelemetry.gradle.js2p.OtelRuleFactory::class.java)
-
- // Prefer builders to setters
- includeSetters = false
- generateBuilders = true
-
- // Use title field to generate class name, instead of default which is based on filename / propertynames
- useTitleAsClassname = true
-
- // Force java 9+ @Generated annotation, since java 8 @Generated annotation isn't detected by
- // jsonSchema2Pojo and annotation is skipped altogether
- targetVersion = "1.9"
-
- // Append Model as suffix to the generated classes.
- classNameSuffix = "Model"
-
- // Initialize collection fields to null rather than empty collections so that absent YAML
- // properties deserialize as null (not present) rather than [] (explicitly empty). This lets
- // factories distinguish between "user omitted the field" and "user provided an empty list",
- // which is important for validations like IncludeExcludeFactory.
- initializeCollections = false
-}
-
-val generateJsonSchema2Pojo = tasks.getByName("generateJsonSchema2Pojo")
-generateJsonSchema2Pojo.dependsOn(unzipConfigurationSchema)
-
-val syncPojoModelsToSrc = tasks.register("syncPojoModelsToSrc") {
- dependsOn(generateJsonSchema2Pojo)
+// Generates POJOs from the configuration schema and writes them to src/main/java.
+// The generated POJOs are committed to src/main/java and are NOT regenerated as part of the normal
+// build. To regenerate (e.g. after a schema update), run:
+// ./gradlew :sdk-extensions:declarative-config:syncPojoModelsToSrc
+val syncPojoModelsToSrc = tasks.register("syncPojoModelsToSrc") {
+ // This task is only run manually (to regenerate committed model POJOs after a schema update).
+ // It writes into src/main/java, which is outside the normal Gradle output boundary, so it
+ // intentionally doesn't participate in the configuration cache.
+ notCompatibleWithConfigurationCache("Regenerates committed model POJOs in src/main/java")
+ dependsOn(unzipConfigurationSchema)
finalizedBy("spotlessApply")
+ val schemaFile = File("$buildDirectory/configuration/opentelemetry_configuration.json")
val modelPackage = "io.opentelemetry.sdk.autoconfigure.declarativeconfig.model"
- val internalPackage = "$modelPackage.internal"
- val modelDir = File(projectDir, "src/main/java/${modelPackage.replace('.', '/')}")
- doFirst {
- require(JavaVersion.current() == JavaVersion.VERSION_21) {
- "syncPojoModelsToSrc requires Java 21 (current: ${JavaVersion.current()}). jsonschema2pojo output is JVM-version-sensitive; using the wrong version produces spurious diffs."
- }
- // Copy won't remove files that no longer exist in the source. Delete first so schema type removals don't leave stale classes.
- modelDir.deleteRecursively()
- }
-
- from("$buildDirectory/generated/sources/js2p/java/main")
- into("$projectDir/src/main/java")
- // Replace java 9+ @Generated annotation with java 8 version (path-independent).
- filter {
- it.replace("import javax.annotation.processing.Generated;", "import javax.annotation.Generated;")
- }
-
+ val modelSrcDir = File(projectDir, "src/main/java")
doLast {
- // Experimental types live in the internal sub-package; stable types in the model package.
- // codemodel emits imports for cross-package top-level references automatically, but always
- // fully-qualifies nested type references (e.g. OuterModel.NestedEnum) regardless of package.
- // Shorten only references to a file's OWN package; cross-package FQCNs are left intact and
- // valid. For model files the prefix must not match the longer internal prefix.
- val stripModelPrefix = Regex(Regex.escape("$modelPackage.") + "(?!internal\\.)")
- modelDir.walkTopDown().filter { it.isFile && it.extension == "java" }.forEach { file ->
- val inInternal = file.parentFile.name == "internal"
- val text = file.readText()
- val shortened =
- if (inInternal) {
- text.replace("$internalPackage.", "")
- } else {
- text.replace(stripModelPrefix, "")
- }
- file.writeText(shortened)
- }
+ val modelDir = File(modelSrcDir, modelPackage.replace('.', '/'))
+ // Delete first so schema type removals don't leave stale classes.
+ modelDir.deleteRecursively()
+ DeclarativeConfigPojoGenerator(schemaFile, modelSrcDir, modelPackage).generate()
}
}
@@ -211,19 +142,6 @@ sourceSets {
}
}
-afterEvaluate {
- // The jsonschema2pojo plugin auto-adds its targetDirectory to the main source set. Remove it so
- // that only the committed model POJOs in src/main/java are compiled, avoiding duplicate classes.
- val js2pDir = File(buildDirectory, "generated/sources/js2p/java/main")
- sourceSets {
- main {
- java {
- setSrcDirs(srcDirs.filter { it != js2pDir })
- }
- }
- }
-}
-
val buildGraalVmReflectionJson = tasks.register("buildGraalVmReflectionJson") {
val buildDir = buildDirectory
val targetFile = File(
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactory.java
index 27fee4f3c5a..627bc281691 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactory.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactory.java
@@ -12,6 +12,7 @@
import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeTypeModel;
import java.util.List;
import javax.annotation.Nullable;
@@ -40,9 +41,9 @@ private static void addToBuilder(
AttributeNameValueModel nameValueModel, AttributesBuilder builder) {
String name = FileConfigUtil.requireNonNull(nameValueModel.getName(), "attribute name");
Object value = FileConfigUtil.requireNonNull(nameValueModel.getValue(), "attribute value");
- AttributeNameValueModel.AttributeType type = nameValueModel.getType();
+ AttributeTypeModel type = nameValueModel.getType();
if (type == null) {
- type = AttributeNameValueModel.AttributeType.STRING;
+ type = AttributeTypeModel.STRING;
}
switch (type) {
case STRING:
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactory.java
index 7c504d45be7..31db67e2912 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactory.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactory.java
@@ -14,11 +14,12 @@
import io.opentelemetry.api.trace.SpanContext;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.context.Context;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanKindModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableRuleBasedSamplerModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableRuleBasedSamplerRuleModel;
-import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalSpanParent;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalSpanParentModel;
import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate;
import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableRuleBasedSamplerBuilder;
import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler;
@@ -54,7 +55,7 @@ public ComposableSampler create(
rule -> {
AttributeMatcher valueMatcher = attributeValuesMatcher(rule.getAttributeValues());
AttributeMatcher patternMatcher = attributePatternsMatcher(rule.getAttributePatterns());
- Set matchingParents =
+ Set matchingParents =
rule.getParent() != null && !rule.getParent().isEmpty()
? new HashSet<>(rule.getParent())
: null;
@@ -118,13 +119,13 @@ private static AttributeMatcher attributePatternsMatcher(
static final class DeclarativeConfigSamplingPredicate implements SamplingPredicate {
@Nullable private final AttributeMatcher attributeValuesMatcher;
@Nullable private final AttributeMatcher attributePatternsMatcher;
- @Nullable private final Set matchingParents;
+ @Nullable private final Set matchingParents;
@Nullable private final Set matchingSpanKinds;
DeclarativeConfigSamplingPredicate(
@Nullable AttributeMatcher attributeValuesMatcher,
@Nullable AttributeMatcher attributePatternsMatcher,
- @Nullable Set matchingParents,
+ @Nullable Set matchingParents,
@Nullable Set matchingSpanKinds) {
this.attributeValuesMatcher = attributeValuesMatcher;
this.attributePatternsMatcher = attributePatternsMatcher;
@@ -189,8 +190,7 @@ public String toString() {
return joiner.toString();
}
- private static SpanKind toSpanKind(
- io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanKind spanKind) {
+ private static SpanKind toSpanKind(SpanKindModel spanKind) {
switch (spanKind) {
case INTERNAL:
return SpanKind.INTERNAL;
@@ -207,14 +207,14 @@ private static SpanKind toSpanKind(
}
// Visible for testing
- static ExperimentalSpanParent toSpanParent(SpanContext parentSpanContext) {
+ static ExperimentalSpanParentModel toSpanParent(SpanContext parentSpanContext) {
if (!parentSpanContext.isValid()) {
- return ExperimentalSpanParent.NONE;
+ return ExperimentalSpanParentModel.NONE;
}
if (parentSpanContext.isRemote()) {
- return ExperimentalSpanParent.REMOTE;
+ return ExperimentalSpanParentModel.REMOTE;
}
- return ExperimentalSpanParent.LOCAL;
+ return ExperimentalSpanParentModel.LOCAL;
}
}
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactory.java
index dcce34aea89..dc11f5a692e 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactory.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactory.java
@@ -6,11 +6,10 @@
package io.opentelemetry.sdk.autoconfigure.declarativeconfig;
import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
-import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExemplarFilterModel;
import io.opentelemetry.sdk.metrics.ExemplarFilter;
-final class ExemplarFilterFactory
- implements Factory {
+final class ExemplarFilterFactory implements Factory {
private static final ExemplarFilterFactory INSTANCE = new ExemplarFilterFactory();
@@ -21,8 +20,7 @@ static ExemplarFilterFactory getInstance() {
}
@Override
- public ExemplarFilter create(
- MeterProviderModel.ExemplarFilter model, DeclarativeConfigContext context) {
+ public ExemplarFilter create(ExemplarFilterModel model, DeclarativeConfigContext context) {
switch (model) {
case ALWAYS_ON:
return ExemplarFilter.alwaysOn();
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactory.java
index 8aa1ca57941..2d09e147ae6 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactory.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactory.java
@@ -10,7 +10,7 @@
import io.opentelemetry.api.logs.Severity;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel;
-import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel.SeverityNumber;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SeverityNumberModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLoggerConfigModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLoggerConfiguratorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLoggerMatcherAndConfigModel;
@@ -117,7 +117,7 @@ public LoggerConfig create(
}
// Visible for testing
- static Severity severityNumberToSeverity(SeverityNumber model) {
+ static Severity severityNumberToSeverity(SeverityNumberModel model) {
switch (model) {
case TRACE:
return Severity.TRACE;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactory.java
index c6e691a91f0..919d7130d73 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactory.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactory.java
@@ -7,6 +7,7 @@
import static io.opentelemetry.sdk.autoconfigure.declarativeconfig.FileConfigUtil.requireNonNull;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExemplarFilterModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MetricReaderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewModel;
@@ -95,7 +96,7 @@ public SdkMeterProviderBuilder create(
SdkMeterProviderUtil.setMeterConfigurator(builder, configuratorBuilder.build());
}
- MeterProviderModel.ExemplarFilter exemplarFilterModel = model.getExemplarFilter();
+ ExemplarFilterModel exemplarFilterModel = model.getExemplarFilter();
if (exemplarFilterModel != null) {
builder.setExemplarFilter(
ExemplarFilterFactory.getInstance().create(exemplarFilterModel, context));
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 8effb7470a0..245c3a1ef6a 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
@@ -20,7 +20,7 @@
"last_value",
"sum"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class AggregationModel {
@Nullable private DefaultAggregationModel _default;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AlwaysOffSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AlwaysOffSamplerModel.java
index 2aa1123a9a7..849086d16be 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AlwaysOffSamplerModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AlwaysOffSamplerModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class AlwaysOffSamplerModel {
@Override
public String toString() {
- return "AlwaysOffSamplerModel{" + "}";
+ return "AlwaysOffSamplerModel{}";
}
@Override
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AlwaysOnSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AlwaysOnSamplerModel.java
index b1346b2d370..167f8c43a88 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AlwaysOnSamplerModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AlwaysOnSamplerModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class AlwaysOnSamplerModel {
@Override
public String toString() {
- return "AlwaysOnSamplerModel{" + "}";
+ return "AlwaysOnSamplerModel{}";
}
@Override
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 f99022c9ec2..ccaf1a8c9bd 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"attribute_value_length_limit", "attribute_count_limit"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class AttributeLimitsModel {
@Nullable private Integer attributeValueLengthLimit;
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 4daa3ef9a8d..4c4d0a48ba1 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
@@ -5,24 +5,20 @@
package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
-import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
import javax.annotation.Generated;
import javax.annotation.Nullable;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"name", "value", "type"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class AttributeNameValueModel {
@Nullable private String name;
@Nullable private Object value;
- @Nullable private AttributeNameValueModel.AttributeType type;
+ @Nullable private AttributeTypeModel type;
/**
* The attribute name.
@@ -85,12 +81,12 @@ public AttributeNameValueModel withValue(Object value) {
*/
@JsonProperty("type")
@Nullable
- public AttributeNameValueModel.AttributeType getType() {
+ public AttributeTypeModel getType() {
return type;
}
@JsonProperty("type")
- public AttributeNameValueModel withType(AttributeNameValueModel.AttributeType type) {
+ public AttributeNameValueModel withType(AttributeTypeModel type) {
this.type = type;
return this;
}
@@ -132,49 +128,4 @@ public boolean equals(@Nullable Object o) {
}
return false;
}
-
- @Generated("jsonschema2pojo")
- public enum AttributeType {
- STRING("string"),
- BOOL("bool"),
- INT("int"),
- DOUBLE("double"),
- STRING_ARRAY("string_array"),
- BOOL_ARRAY("bool_array"),
- INT_ARRAY("int_array"),
- DOUBLE_ARRAY("double_array");
- private final String value;
- private static final Map CONSTANTS =
- new HashMap();
-
- static {
- for (AttributeNameValueModel.AttributeType c : values()) {
- CONSTANTS.put(c.value, c);
- }
- }
-
- AttributeType(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-
- @JsonValue
- public String value() {
- return this.value;
- }
-
- @JsonCreator
- public static AttributeNameValueModel.AttributeType fromValue(String value) {
- AttributeNameValueModel.AttributeType constant = CONSTANTS.get(value);
- if (constant == null) {
- throw new IllegalArgumentException(value);
- } else {
- return constant;
- }
- }
- }
}
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeTypeModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeTypeModel.java
new file mode 100644
index 00000000000..9280b6503b4
--- /dev/null
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/AttributeTypeModel.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum AttributeTypeModel {
+ STRING("string"),
+ BOOL("bool"),
+ INT("int"),
+ DOUBLE("double"),
+ STRING_ARRAY("string_array"),
+ BOOL_ARRAY("bool_array"),
+ INT_ARRAY("int_array"),
+ DOUBLE_ARRAY("double_array");
+ private final String value;
+ private static final Map CONSTANTS =
+ new HashMap();
+
+ static {
+ for (AttributeTypeModel c : values()) {
+ CONSTANTS.put(c.value, c);
+ }
+ }
+
+ AttributeTypeModel(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return this.value;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+ @JsonCreator
+ public static AttributeTypeModel fromValue(String value) {
+ AttributeTypeModel constant = CONSTANTS.get(value);
+ if (constant == null) {
+ throw new IllegalArgumentException(value);
+ } else {
+ return constant;
+ }
+ }
+}
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/B3MultiPropagatorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/B3MultiPropagatorModel.java
index f4d61443dc1..d05b3a7e375 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/B3MultiPropagatorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/B3MultiPropagatorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class B3MultiPropagatorModel {
@Override
public String toString() {
- return "B3MultiPropagatorModel{" + "}";
+ return "B3MultiPropagatorModel{}";
}
@Override
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/B3PropagatorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/B3PropagatorModel.java
index 78a2f24eba9..8846372d3cb 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/B3PropagatorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/B3PropagatorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class B3PropagatorModel {
@Override
public String toString() {
- return "B3PropagatorModel{" + "}";
+ return "B3PropagatorModel{}";
}
@Override
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BaggagePropagatorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BaggagePropagatorModel.java
index 8db9759a7f4..e35b7e83348 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BaggagePropagatorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/BaggagePropagatorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class BaggagePropagatorModel {
@Override
public String toString() {
- return "BaggagePropagatorModel{" + "}";
+ return "BaggagePropagatorModel{}";
}
@Override
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 4ccfdd03ac0..e0101f29bd6 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"max_scale", "max_size", "record_min_max"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class Base2ExponentialBucketHistogramAggregationModel {
@Nullable private Integer maxScale;
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 4897c0093cf..3d9ac80a3c2 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
@@ -19,7 +19,7 @@
"max_export_batch_size",
"exporter"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class BatchLogRecordProcessorModel {
@Nullable private Integer scheduleDelay;
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 f16a2ca9eb3..4671acf7957 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
@@ -19,7 +19,7 @@
"max_export_batch_size",
"exporter"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class BatchSpanProcessorModel {
@Nullable private Integer scheduleDelay;
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 41c561f1559..8fecb8b00e1 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
@@ -22,7 +22,7 @@
"observable_up_down_counter",
"up_down_counter"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class CardinalityLimitsModel {
@Nullable private Integer _default;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ConsoleExporterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ConsoleExporterModel.java
index bbd1028d657..ffaa57b846e 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ConsoleExporterModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ConsoleExporterModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ConsoleExporterModel {
@Override
public String toString() {
- return "ConsoleExporterModel{" + "}";
+ return "ConsoleExporterModel{}";
}
@Override
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 18861e34e62..2b5992ae800 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
@@ -13,14 +13,11 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"temporality_preference", "default_histogram_aggregation"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ConsoleMetricExporterModel {
- @Nullable private OtlpHttpMetricExporterModel.ExporterTemporalityPreference temporalityPreference;
-
- @Nullable
- private OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation
- defaultHistogramAggregation;
+ @Nullable private ExporterTemporalityPreferenceModel temporalityPreference;
+ @Nullable private ExporterDefaultHistogramAggregationModel defaultHistogramAggregation;
/**
* Configure temporality preference.
@@ -39,13 +36,13 @@ public class ConsoleMetricExporterModel {
*/
@JsonProperty("temporality_preference")
@Nullable
- public OtlpHttpMetricExporterModel.ExporterTemporalityPreference getTemporalityPreference() {
+ public ExporterTemporalityPreferenceModel getTemporalityPreference() {
return temporalityPreference;
}
@JsonProperty("temporality_preference")
public ConsoleMetricExporterModel withTemporalityPreference(
- OtlpHttpMetricExporterModel.ExporterTemporalityPreference temporalityPreference) {
+ ExporterTemporalityPreferenceModel temporalityPreference) {
this.temporalityPreference = temporalityPreference;
return this;
}
@@ -65,14 +62,13 @@ public ConsoleMetricExporterModel withTemporalityPreference(
*/
@JsonProperty("default_histogram_aggregation")
@Nullable
- public OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation
- getDefaultHistogramAggregation() {
+ public ExporterDefaultHistogramAggregationModel getDefaultHistogramAggregation() {
return defaultHistogramAggregation;
}
@JsonProperty("default_histogram_aggregation")
public ConsoleMetricExporterModel withDefaultHistogramAggregation(
- OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation defaultHistogramAggregation) {
+ ExporterDefaultHistogramAggregationModel defaultHistogramAggregation) {
this.defaultHistogramAggregation = defaultHistogramAggregation;
return this;
}
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DefaultAggregationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DefaultAggregationModel.java
index e56de199f29..b0a84de4def 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DefaultAggregationModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DefaultAggregationModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class DefaultAggregationModel {
@Override
public String toString() {
- return "DefaultAggregationModel{" + "}";
+ return "DefaultAggregationModel{}";
}
@Override
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DistributionModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DistributionModel.java
index 824b4fa4540..b5960eeae3c 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DistributionModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DistributionModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class DistributionModel {
private Map additionalProperties =
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DistributionPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DistributionPropertyModel.java
index 4dfd2fc3788..321e484d8b5 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DistributionPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DistributionPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class DistributionPropertyModel {
private Map additionalProperties = new LinkedHashMap();
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DropAggregationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DropAggregationModel.java
index ededb140f95..520e9d12225 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DropAggregationModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/DropAggregationModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class DropAggregationModel {
@Override
public String toString() {
- return "DropAggregationModel{" + "}";
+ return "DropAggregationModel{}";
}
@Override
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExemplarFilterModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExemplarFilterModel.java
new file mode 100644
index 00000000000..3ae48a36af4
--- /dev/null
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExemplarFilterModel.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum ExemplarFilterModel {
+ ALWAYS_ON("always_on"),
+ ALWAYS_OFF("always_off"),
+ TRACE_BASED("trace_based");
+ private final String value;
+ private static final Map CONSTANTS =
+ new HashMap();
+
+ static {
+ for (ExemplarFilterModel c : values()) {
+ CONSTANTS.put(c.value, c);
+ }
+ }
+
+ ExemplarFilterModel(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return this.value;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+ @JsonCreator
+ public static ExemplarFilterModel fromValue(String value) {
+ ExemplarFilterModel constant = CONSTANTS.get(value);
+ if (constant == null) {
+ throw new IllegalArgumentException(value);
+ } else {
+ return constant;
+ }
+ }
+}
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 39f1c2cd812..87c083d22b3 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"boundaries", "record_min_max"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExplicitBucketHistogramAggregationModel {
@Nullable private List boundaries;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExporterDefaultHistogramAggregationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExporterDefaultHistogramAggregationModel.java
new file mode 100644
index 00000000000..1b58a39500e
--- /dev/null
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExporterDefaultHistogramAggregationModel.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum ExporterDefaultHistogramAggregationModel {
+ EXPLICIT_BUCKET_HISTOGRAM("explicit_bucket_histogram"),
+ BASE_2_EXPONENTIAL_BUCKET_HISTOGRAM("base2_exponential_bucket_histogram");
+ private final String value;
+ private static final Map CONSTANTS =
+ new HashMap();
+
+ static {
+ for (ExporterDefaultHistogramAggregationModel c : values()) {
+ CONSTANTS.put(c.value, c);
+ }
+ }
+
+ ExporterDefaultHistogramAggregationModel(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return this.value;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+ @JsonCreator
+ public static ExporterDefaultHistogramAggregationModel fromValue(String value) {
+ ExporterDefaultHistogramAggregationModel constant = CONSTANTS.get(value);
+ if (constant == null) {
+ throw new IllegalArgumentException(value);
+ } else {
+ return constant;
+ }
+ }
+}
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExporterTemporalityPreferenceModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExporterTemporalityPreferenceModel.java
new file mode 100644
index 00000000000..2fe55ea200b
--- /dev/null
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ExporterTemporalityPreferenceModel.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum ExporterTemporalityPreferenceModel {
+ CUMULATIVE("cumulative"),
+ DELTA("delta"),
+ LOW_MEMORY("low_memory");
+ private final String value;
+ private static final Map CONSTANTS =
+ new HashMap();
+
+ static {
+ for (ExporterTemporalityPreferenceModel c : values()) {
+ CONSTANTS.put(c.value, c);
+ }
+ }
+
+ ExporterTemporalityPreferenceModel(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return this.value;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+ @JsonCreator
+ public static ExporterTemporalityPreferenceModel fromValue(String value) {
+ ExporterTemporalityPreferenceModel constant = CONSTANTS.get(value);
+ if (constant == null) {
+ throw new IllegalArgumentException(value);
+ } else {
+ return constant;
+ }
+ }
+}
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 1587fe7ff60..f74ef2effc2 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"ca_file", "key_file", "cert_file", "insecure"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class GrpcTlsModel {
@Nullable private String caFile;
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 785d7aa078f..b87893d3f0c 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"ca_file", "key_file", "cert_file"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class HttpTlsModel {
@Nullable private String caFile;
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 812ee600768..fb60f7df2ee 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
@@ -17,7 +17,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"random"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class IdGeneratorModel {
@Nullable private RandomIdGeneratorModel random;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IdGeneratorPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IdGeneratorPropertyModel.java
index 87a2bbffd3c..abb1bee2693 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IdGeneratorPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/IdGeneratorPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class IdGeneratorPropertyModel {
private Map additionalProperties = new LinkedHashMap();
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 1b0c6bbf766..7f46b883948 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"included", "excluded"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class IncludeExcludeModel {
@Nullable private List included;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/InstrumentTypeModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/InstrumentTypeModel.java
new file mode 100644
index 00000000000..3688bc27553
--- /dev/null
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/InstrumentTypeModel.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum InstrumentTypeModel {
+ COUNTER("counter"),
+ GAUGE("gauge"),
+ HISTOGRAM("histogram"),
+ OBSERVABLE_COUNTER("observable_counter"),
+ OBSERVABLE_GAUGE("observable_gauge"),
+ OBSERVABLE_UP_DOWN_COUNTER("observable_up_down_counter"),
+ UP_DOWN_COUNTER("up_down_counter");
+ private final String value;
+ private static final Map CONSTANTS =
+ new HashMap();
+
+ static {
+ for (InstrumentTypeModel c : values()) {
+ CONSTANTS.put(c.value, c);
+ }
+ }
+
+ InstrumentTypeModel(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return this.value;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+ @JsonCreator
+ public static InstrumentTypeModel fromValue(String value) {
+ InstrumentTypeModel constant = CONSTANTS.get(value);
+ if (constant == null) {
+ throw new IllegalArgumentException(value);
+ } else {
+ return constant;
+ }
+ }
+}
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LastValueAggregationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LastValueAggregationModel.java
index 1cd8bb4a675..330f719e337 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LastValueAggregationModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LastValueAggregationModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class LastValueAggregationModel {
@Override
public String toString() {
- return "LastValueAggregationModel{" + "}";
+ return "LastValueAggregationModel{}";
}
@Override
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 b43a4b0fd3a..aa34ebe0f89 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
@@ -18,7 +18,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"otlp_http", "otlp_grpc", "otlp_file/development", "console"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class LogRecordExporterModel {
@Nullable private OtlpHttpExporterModel otlpHttp;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordExporterPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordExporterPropertyModel.java
index 29be6c517c5..5a462047081 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordExporterPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordExporterPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class LogRecordExporterPropertyModel {
private Map additionalProperties = new LinkedHashMap();
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 6b3adc439ea..24e13258133 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"attribute_value_length_limit", "attribute_count_limit"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class LogRecordLimitsModel {
@Nullable private Integer attributeValueLengthLimit;
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 781d9b853e4..f20ebdd30f2 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
@@ -18,7 +18,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"batch", "simple", "event_to_span_event_bridge/development"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class LogRecordProcessorModel {
@Nullable private BatchLogRecordProcessorModel batch;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordProcessorPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordProcessorPropertyModel.java
index 761625ced9d..5ebf23bc184 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordProcessorPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/LogRecordProcessorPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class LogRecordProcessorPropertyModel {
private Map additionalProperties = new LinkedHashMap();
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 d6701041805..ae5a722a1fe 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
@@ -15,7 +15,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"processors", "limits", "logger_configurator/development"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class LoggerProviderModel {
@Nullable private List processors;
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 c8107247f75..0bb90d10df6 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
@@ -5,26 +5,22 @@
package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
-import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalMeterConfiguratorModel;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.annotation.Generated;
import javax.annotation.Nullable;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"readers", "views", "exemplar_filter", "meter_configurator/development"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class MeterProviderModel {
@Nullable private List readers;
@Nullable private List views;
- @Nullable private MeterProviderModel.ExemplarFilter exemplarFilter;
+ @Nullable private ExemplarFilterModel exemplarFilter;
@Nullable private ExperimentalMeterConfiguratorModel meterConfiguratorDevelopment;
/**
@@ -80,12 +76,12 @@ public MeterProviderModel withViews(List views) {
*/
@JsonProperty("exemplar_filter")
@Nullable
- public MeterProviderModel.ExemplarFilter getExemplarFilter() {
+ public ExemplarFilterModel getExemplarFilter() {
return exemplarFilter;
}
@JsonProperty("exemplar_filter")
- public MeterProviderModel withExemplarFilter(MeterProviderModel.ExemplarFilter exemplarFilter) {
+ public MeterProviderModel withExemplarFilter(ExemplarFilterModel exemplarFilter) {
this.exemplarFilter = exemplarFilter;
return this;
}
@@ -157,44 +153,4 @@ public boolean equals(@Nullable Object o) {
}
return false;
}
-
- @Generated("jsonschema2pojo")
- public enum ExemplarFilter {
- ALWAYS_ON("always_on"),
- ALWAYS_OFF("always_off"),
- TRACE_BASED("trace_based");
- private final String value;
- private static final Map CONSTANTS =
- new HashMap();
-
- static {
- for (MeterProviderModel.ExemplarFilter c : values()) {
- CONSTANTS.put(c.value, c);
- }
- }
-
- ExemplarFilter(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-
- @JsonValue
- public String value() {
- return this.value;
- }
-
- @JsonCreator
- public static MeterProviderModel.ExemplarFilter fromValue(String value) {
- MeterProviderModel.ExemplarFilter constant = CONSTANTS.get(value);
- if (constant == null) {
- throw new IllegalArgumentException(value);
- } else {
- return constant;
- }
- }
- }
}
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 9569bf4cb3d..ca6109b59b1 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
@@ -17,7 +17,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"opencensus"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class MetricProducerModel {
@Nullable private OpenCensusMetricProducerModel opencensus;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricProducerPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricProducerPropertyModel.java
index 794434c7260..0155f409308 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricProducerPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/MetricProducerPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class MetricProducerPropertyModel {
private Map additionalProperties = new LinkedHashMap();
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 57a8c70349b..8ff3ab90743 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"periodic", "pull"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class MetricReaderModel {
@Nullable private PeriodicMetricReaderModel periodic;
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 20e11da0de9..87c62310810 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"name", "value"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class NameStringValuePairModel {
@Nullable private String name;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OpenCensusMetricProducerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OpenCensusMetricProducerModel.java
index d949facf6a3..d9589cf6ccd 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OpenCensusMetricProducerModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OpenCensusMetricProducerModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class OpenCensusMetricProducerModel {
@Override
public String toString() {
- return "OpenCensusMetricProducerModel{" + "}";
+ return "OpenCensusMetricProducerModel{}";
}
@Override
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 e83d32af0f0..1e73faf5968 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
@@ -7,23 +7,15 @@
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalInstrumentationModel;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.annotation.Generated;
import javax.annotation.Nullable;
-/**
- * OpenTelemetryConfiguration
- *
- *
- */
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"file_format",
@@ -38,12 +30,12 @@
"instrumentation/development",
"distribution"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class OpenTelemetryConfigurationModel {
@Nullable private String fileFormat;
@Nullable private Boolean disabled;
- @Nullable private OpenTelemetryConfigurationModel.SeverityNumber logLevel;
+ @Nullable private SeverityNumberModel logLevel;
@Nullable private AttributeLimitsModel attributeLimits;
@Nullable private LoggerProviderModel loggerProvider;
@Nullable private MeterProviderModel meterProvider;
@@ -154,13 +146,12 @@ public OpenTelemetryConfigurationModel withDisabled(Boolean disabled) {
*/
@JsonProperty("log_level")
@Nullable
- public OpenTelemetryConfigurationModel.SeverityNumber getLogLevel() {
+ public SeverityNumberModel getLogLevel() {
return logLevel;
}
@JsonProperty("log_level")
- public OpenTelemetryConfigurationModel withLogLevel(
- OpenTelemetryConfigurationModel.SeverityNumber logLevel) {
+ public OpenTelemetryConfigurationModel withLogLevel(SeverityNumberModel logLevel) {
this.logLevel = logLevel;
return this;
}
@@ -419,65 +410,4 @@ public boolean equals(@Nullable Object o) {
}
return false;
}
-
- @Generated("jsonschema2pojo")
- public enum SeverityNumber {
- TRACE("trace"),
- TRACE_2("trace2"),
- TRACE_3("trace3"),
- TRACE_4("trace4"),
- DEBUG("debug"),
- DEBUG_2("debug2"),
- DEBUG_3("debug3"),
- DEBUG_4("debug4"),
- INFO("info"),
- INFO_2("info2"),
- INFO_3("info3"),
- INFO_4("info4"),
- WARN("warn"),
- WARN_2("warn2"),
- WARN_3("warn3"),
- WARN_4("warn4"),
- ERROR("error"),
- ERROR_2("error2"),
- ERROR_3("error3"),
- ERROR_4("error4"),
- FATAL("fatal"),
- FATAL_2("fatal2"),
- FATAL_3("fatal3"),
- FATAL_4("fatal4");
- private final String value;
- private static final Map CONSTANTS =
- new HashMap();
-
- static {
- for (OpenTelemetryConfigurationModel.SeverityNumber c : values()) {
- CONSTANTS.put(c.value, c);
- }
- }
-
- SeverityNumber(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-
- @JsonValue
- public String value() {
- return this.value;
- }
-
- @JsonCreator
- public static OpenTelemetryConfigurationModel.SeverityNumber fromValue(String value) {
- OpenTelemetryConfigurationModel.SeverityNumber constant = CONSTANTS.get(value);
- if (constant == null) {
- throw new IllegalArgumentException(value);
- } else {
- return constant;
- }
- }
- }
}
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 60107423339..fd9dce77176 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"endpoint", "tls", "headers", "headers_list", "compression", "timeout"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class OtlpGrpcExporterModel {
@Nullable private String endpoint;
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 061259141ce..dadb13fd661 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
@@ -23,7 +23,7 @@
"temporality_preference",
"default_histogram_aggregation"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class OtlpGrpcMetricExporterModel {
@Nullable private String endpoint;
@@ -32,11 +32,8 @@ public class OtlpGrpcMetricExporterModel {
@Nullable private String headersList;
@Nullable private String compression;
@Nullable private Integer timeout;
- @Nullable private OtlpHttpMetricExporterModel.ExporterTemporalityPreference temporalityPreference;
-
- @Nullable
- private OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation
- defaultHistogramAggregation;
+ @Nullable private ExporterTemporalityPreferenceModel temporalityPreference;
+ @Nullable private ExporterDefaultHistogramAggregationModel defaultHistogramAggregation;
/**
* Configure endpoint.
@@ -168,13 +165,13 @@ public OtlpGrpcMetricExporterModel withTimeout(Integer timeout) {
*/
@JsonProperty("temporality_preference")
@Nullable
- public OtlpHttpMetricExporterModel.ExporterTemporalityPreference getTemporalityPreference() {
+ public ExporterTemporalityPreferenceModel getTemporalityPreference() {
return temporalityPreference;
}
@JsonProperty("temporality_preference")
public OtlpGrpcMetricExporterModel withTemporalityPreference(
- OtlpHttpMetricExporterModel.ExporterTemporalityPreference temporalityPreference) {
+ ExporterTemporalityPreferenceModel temporalityPreference) {
this.temporalityPreference = temporalityPreference;
return this;
}
@@ -194,14 +191,13 @@ public OtlpGrpcMetricExporterModel withTemporalityPreference(
*/
@JsonProperty("default_histogram_aggregation")
@Nullable
- public OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation
- getDefaultHistogramAggregation() {
+ public ExporterDefaultHistogramAggregationModel getDefaultHistogramAggregation() {
return defaultHistogramAggregation;
}
@JsonProperty("default_histogram_aggregation")
public OtlpGrpcMetricExporterModel withDefaultHistogramAggregation(
- OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation defaultHistogramAggregation) {
+ ExporterDefaultHistogramAggregationModel defaultHistogramAggregation) {
this.defaultHistogramAggregation = defaultHistogramAggregation;
return this;
}
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpEncodingModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpEncodingModel.java
new file mode 100644
index 00000000000..ae7b872ba1c
--- /dev/null
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/OtlpHttpEncodingModel.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum OtlpHttpEncodingModel {
+ PROTOBUF("protobuf"),
+ JSON("json");
+ private final String value;
+ private static final Map CONSTANTS =
+ new HashMap();
+
+ static {
+ for (OtlpHttpEncodingModel c : values()) {
+ CONSTANTS.put(c.value, c);
+ }
+ }
+
+ OtlpHttpEncodingModel(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return this.value;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+ @JsonCreator
+ public static OtlpHttpEncodingModel fromValue(String value) {
+ OtlpHttpEncodingModel constant = CONSTANTS.get(value);
+ if (constant == null) {
+ throw new IllegalArgumentException(value);
+ } else {
+ return constant;
+ }
+ }
+}
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 f48c454419a..4a197e093f4 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
@@ -5,14 +5,10 @@
package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
-import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.annotation.Generated;
import javax.annotation.Nullable;
@@ -26,7 +22,7 @@
"timeout",
"encoding"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class OtlpHttpExporterModel {
@Nullable private String endpoint;
@@ -35,7 +31,7 @@ public class OtlpHttpExporterModel {
@Nullable private String headersList;
@Nullable private String compression;
@Nullable private Integer timeout;
- @Nullable private OtlpHttpExporterModel.OtlpHttpEncoding encoding;
+ @Nullable private OtlpHttpEncodingModel encoding;
/**
* Configure endpoint, including the signal specific path.
@@ -166,12 +162,12 @@ public OtlpHttpExporterModel withTimeout(Integer timeout) {
*/
@JsonProperty("encoding")
@Nullable
- public OtlpHttpExporterModel.OtlpHttpEncoding getEncoding() {
+ public OtlpHttpEncodingModel getEncoding() {
return encoding;
}
@JsonProperty("encoding")
- public OtlpHttpExporterModel withEncoding(OtlpHttpExporterModel.OtlpHttpEncoding encoding) {
+ public OtlpHttpExporterModel withEncoding(OtlpHttpEncodingModel encoding) {
this.encoding = encoding;
return this;
}
@@ -237,43 +233,4 @@ public boolean equals(@Nullable Object o) {
}
return false;
}
-
- @Generated("jsonschema2pojo")
- public enum OtlpHttpEncoding {
- PROTOBUF("protobuf"),
- JSON("json");
- private final String value;
- private static final Map CONSTANTS =
- new HashMap();
-
- static {
- for (OtlpHttpExporterModel.OtlpHttpEncoding c : values()) {
- CONSTANTS.put(c.value, c);
- }
- }
-
- OtlpHttpEncoding(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-
- @JsonValue
- public String value() {
- return this.value;
- }
-
- @JsonCreator
- public static OtlpHttpExporterModel.OtlpHttpEncoding fromValue(String value) {
- OtlpHttpExporterModel.OtlpHttpEncoding constant = CONSTANTS.get(value);
- if (constant == null) {
- throw new IllegalArgumentException(value);
- } else {
- return constant;
- }
- }
- }
}
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 8fbb2e582b6..39f49036940 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
@@ -5,14 +5,10 @@
package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
-import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.annotation.Generated;
import javax.annotation.Nullable;
@@ -28,7 +24,7 @@
"temporality_preference",
"default_histogram_aggregation"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class OtlpHttpMetricExporterModel {
@Nullable private String endpoint;
@@ -37,12 +33,9 @@ public class OtlpHttpMetricExporterModel {
@Nullable private String headersList;
@Nullable private String compression;
@Nullable private Integer timeout;
- @Nullable private OtlpHttpExporterModel.OtlpHttpEncoding encoding;
- @Nullable private OtlpHttpMetricExporterModel.ExporterTemporalityPreference temporalityPreference;
-
- @Nullable
- private OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation
- defaultHistogramAggregation;
+ @Nullable private OtlpHttpEncodingModel encoding;
+ @Nullable private ExporterTemporalityPreferenceModel temporalityPreference;
+ @Nullable private ExporterDefaultHistogramAggregationModel defaultHistogramAggregation;
/**
* Configure endpoint.
@@ -172,12 +165,12 @@ public OtlpHttpMetricExporterModel withTimeout(Integer timeout) {
*/
@JsonProperty("encoding")
@Nullable
- public OtlpHttpExporterModel.OtlpHttpEncoding getEncoding() {
+ public OtlpHttpEncodingModel getEncoding() {
return encoding;
}
@JsonProperty("encoding")
- public OtlpHttpMetricExporterModel withEncoding(OtlpHttpExporterModel.OtlpHttpEncoding encoding) {
+ public OtlpHttpMetricExporterModel withEncoding(OtlpHttpEncodingModel encoding) {
this.encoding = encoding;
return this;
}
@@ -199,13 +192,13 @@ public OtlpHttpMetricExporterModel withEncoding(OtlpHttpExporterModel.OtlpHttpEn
*/
@JsonProperty("temporality_preference")
@Nullable
- public OtlpHttpMetricExporterModel.ExporterTemporalityPreference getTemporalityPreference() {
+ public ExporterTemporalityPreferenceModel getTemporalityPreference() {
return temporalityPreference;
}
@JsonProperty("temporality_preference")
public OtlpHttpMetricExporterModel withTemporalityPreference(
- OtlpHttpMetricExporterModel.ExporterTemporalityPreference temporalityPreference) {
+ ExporterTemporalityPreferenceModel temporalityPreference) {
this.temporalityPreference = temporalityPreference;
return this;
}
@@ -225,14 +218,13 @@ public OtlpHttpMetricExporterModel withTemporalityPreference(
*/
@JsonProperty("default_histogram_aggregation")
@Nullable
- public OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation
- getDefaultHistogramAggregation() {
+ public ExporterDefaultHistogramAggregationModel getDefaultHistogramAggregation() {
return defaultHistogramAggregation;
}
@JsonProperty("default_histogram_aggregation")
public OtlpHttpMetricExporterModel withDefaultHistogramAggregation(
- OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation defaultHistogramAggregation) {
+ ExporterDefaultHistogramAggregationModel defaultHistogramAggregation) {
this.defaultHistogramAggregation = defaultHistogramAggregation;
return this;
}
@@ -315,89 +307,4 @@ public boolean equals(@Nullable Object o) {
}
return false;
}
-
- @Generated("jsonschema2pojo")
- public enum ExporterDefaultHistogramAggregation {
- EXPLICIT_BUCKET_HISTOGRAM("explicit_bucket_histogram"),
- BASE_2_EXPONENTIAL_BUCKET_HISTOGRAM("base2_exponential_bucket_histogram");
- private final String value;
- private static final Map<
- String, OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation>
- CONSTANTS =
- new HashMap();
-
- static {
- for (OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation c : values()) {
- CONSTANTS.put(c.value, c);
- }
- }
-
- ExporterDefaultHistogramAggregation(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-
- @JsonValue
- public String value() {
- return this.value;
- }
-
- @JsonCreator
- public static OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation fromValue(
- String value) {
- OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation constant =
- CONSTANTS.get(value);
- if (constant == null) {
- throw new IllegalArgumentException(value);
- } else {
- return constant;
- }
- }
- }
-
- @Generated("jsonschema2pojo")
- public enum ExporterTemporalityPreference {
- CUMULATIVE("cumulative"),
- DELTA("delta"),
- LOW_MEMORY("low_memory");
- private final String value;
- private static final Map
- CONSTANTS =
- new HashMap();
-
- static {
- for (OtlpHttpMetricExporterModel.ExporterTemporalityPreference c : values()) {
- CONSTANTS.put(c.value, c);
- }
- }
-
- ExporterTemporalityPreference(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-
- @JsonValue
- public String value() {
- return this.value;
- }
-
- @JsonCreator
- public static OtlpHttpMetricExporterModel.ExporterTemporalityPreference fromValue(
- String value) {
- OtlpHttpMetricExporterModel.ExporterTemporalityPreference constant = CONSTANTS.get(value);
- if (constant == null) {
- throw new IllegalArgumentException(value);
- } else {
- return constant;
- }
- }
- }
}
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 04381c1b318..f01f9aa5c9d 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
@@ -19,7 +19,7 @@
"local_parent_sampled",
"local_parent_not_sampled"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ParentBasedSamplerModel {
@Nullable private SamplerModel root;
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 385ff6732dd..dd57f519a4f 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
@@ -21,7 +21,7 @@
"producers",
"cardinality_limits"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class PeriodicMetricReaderModel {
@Nullable private Integer interval;
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 36799242b35..b33f84f1963 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"composite", "composite_list"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class PropagatorModel {
@Nullable private List composite;
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 1859901816f..a726171f0fb 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
@@ -18,7 +18,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"prometheus/development"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class PullMetricExporterModel {
@Nullable private ExperimentalPrometheusMetricExporterModel prometheusDevelopment;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricExporterPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricExporterPropertyModel.java
index a3887bd1ea5..31f63b61f57 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricExporterPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PullMetricExporterPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class PullMetricExporterPropertyModel {
private Map additionalProperties = new LinkedHashMap();
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 767cdfdf1b0..0f42674be09 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"exporter", "producers", "cardinality_limits"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class PullMetricReaderModel {
@Nullable private PullMetricExporterModel exporter;
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 e04f562f630..bbccec6a37f 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
@@ -18,7 +18,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"otlp_http", "otlp_grpc", "otlp_file/development", "console"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class PushMetricExporterModel {
@Nullable private OtlpHttpMetricExporterModel otlpHttp;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PushMetricExporterPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PushMetricExporterPropertyModel.java
index 5a9b28774b1..be108906ead 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PushMetricExporterPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/PushMetricExporterPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class PushMetricExporterPropertyModel {
private Map additionalProperties = new LinkedHashMap();
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/RandomIdGeneratorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/RandomIdGeneratorModel.java
index 822fc040ca6..db908c42caf 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/RandomIdGeneratorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/RandomIdGeneratorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class RandomIdGeneratorModel {
@Override
public String toString() {
- return "RandomIdGeneratorModel{" + "}";
+ return "RandomIdGeneratorModel{}";
}
@Override
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 aeb365d9683..2fdbe659927 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
@@ -15,7 +15,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"attributes", "detection/development", "schema_url", "attributes_list"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ResourceModel {
@Nullable private List attributes;
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 63725e87aa9..e1bdccdc782 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
@@ -28,7 +28,7 @@
"probability/development",
"trace_id_ratio_based"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SamplerModel {
@Nullable private AlwaysOffSamplerModel alwaysOff;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SamplerPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SamplerPropertyModel.java
index 217b03bed53..d2a8a40e355 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SamplerPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SamplerPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SamplerPropertyModel {
private Map additionalProperties = new LinkedHashMap();
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SeverityNumberModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SeverityNumberModel.java
new file mode 100644
index 00000000000..0ff2fbd1293
--- /dev/null
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SeverityNumberModel.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum SeverityNumberModel {
+ TRACE("trace"),
+ TRACE_2("trace2"),
+ TRACE_3("trace3"),
+ TRACE_4("trace4"),
+ DEBUG("debug"),
+ DEBUG_2("debug2"),
+ DEBUG_3("debug3"),
+ DEBUG_4("debug4"),
+ INFO("info"),
+ INFO_2("info2"),
+ INFO_3("info3"),
+ INFO_4("info4"),
+ WARN("warn"),
+ WARN_2("warn2"),
+ WARN_3("warn3"),
+ WARN_4("warn4"),
+ ERROR("error"),
+ ERROR_2("error2"),
+ ERROR_3("error3"),
+ ERROR_4("error4"),
+ FATAL("fatal"),
+ FATAL_2("fatal2"),
+ FATAL_3("fatal3"),
+ FATAL_4("fatal4");
+ private final String value;
+ private static final Map CONSTANTS =
+ new HashMap();
+
+ static {
+ for (SeverityNumberModel c : values()) {
+ CONSTANTS.put(c.value, c);
+ }
+ }
+
+ SeverityNumberModel(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return this.value;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+ @JsonCreator
+ public static SeverityNumberModel fromValue(String value) {
+ SeverityNumberModel constant = CONSTANTS.get(value);
+ if (constant == null) {
+ throw new IllegalArgumentException(value);
+ } else {
+ return constant;
+ }
+ }
+}
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 eeed454ed00..3db8f96772c 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"exporter"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SimpleLogRecordProcessorModel {
@Nullable private LogRecordExporterModel exporter;
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 6d2d7fc2251..441175aaadc 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"exporter"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SimpleSpanProcessorModel {
@Nullable private SpanExporterModel exporter;
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 44f1b245f30..20aec6f4cf5 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
@@ -18,7 +18,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"otlp_http", "otlp_grpc", "otlp_file/development", "console"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SpanExporterModel {
@Nullable private OtlpHttpExporterModel otlpHttp;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanExporterPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanExporterPropertyModel.java
index 38e19c51052..a2e323f35a3 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanExporterPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanExporterPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SpanExporterPropertyModel {
private Map additionalProperties = new LinkedHashMap();
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanKind.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanKindModel.java
similarity index 69%
rename from sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanKind.java
rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanKindModel.java
index c05dc9066d0..d02369a4c3c 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanKind.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanKindModel.java
@@ -11,23 +11,23 @@
import java.util.Map;
import javax.annotation.Generated;
-@Generated("jsonschema2pojo")
-public enum SpanKind {
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum SpanKindModel {
INTERNAL("internal"),
SERVER("server"),
CLIENT("client"),
PRODUCER("producer"),
CONSUMER("consumer");
private final String value;
- private static final Map CONSTANTS = new HashMap();
+ private static final Map CONSTANTS = new HashMap();
static {
- for (SpanKind c : values()) {
+ for (SpanKindModel c : values()) {
CONSTANTS.put(c.value, c);
}
}
- SpanKind(String value) {
+ SpanKindModel(String value) {
this.value = value;
}
@@ -42,8 +42,8 @@ public String value() {
}
@JsonCreator
- public static SpanKind fromValue(String value) {
- SpanKind constant = CONSTANTS.get(value);
+ public static SpanKindModel fromValue(String value) {
+ SpanKindModel constant = CONSTANTS.get(value);
if (constant == null) {
throw new IllegalArgumentException(value);
} else {
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 beb60582d37..3acd087605c 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
@@ -20,7 +20,7 @@
"event_attribute_count_limit",
"link_attribute_count_limit"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SpanLimitsModel {
@Nullable private Integer attributeValueLengthLimit;
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 29fe030814a..1a50b6bd02e 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
@@ -17,7 +17,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"batch", "simple"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SpanProcessorModel {
@Nullable private BatchSpanProcessorModel batch;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanProcessorPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanProcessorPropertyModel.java
index 13e4aa98242..4dbcfc9624e 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanProcessorPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SpanProcessorPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SpanProcessorPropertyModel {
private Map additionalProperties = new LinkedHashMap();
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SumAggregationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SumAggregationModel.java
index 2f4d918ccb0..93c6e60b792 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SumAggregationModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/SumAggregationModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class SumAggregationModel {
@Override
public String toString() {
- return "SumAggregationModel{" + "}";
+ return "SumAggregationModel{}";
}
@Override
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 f65b4f78f52..5e36c249962 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
@@ -17,7 +17,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"tracecontext", "baggage", "b3", "b3multi"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class TextMapPropagatorModel {
@Nullable private TraceContextPropagatorModel tracecontext;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TextMapPropagatorPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TextMapPropagatorPropertyModel.java
index 2cc3cb6a485..1cc7703b715 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TextMapPropagatorPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TextMapPropagatorPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class TextMapPropagatorPropertyModel {
private Map additionalProperties = new LinkedHashMap();
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TraceContextPropagatorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TraceContextPropagatorModel.java
index 0d1790e7027..08094e0c57c 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TraceContextPropagatorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/TraceContextPropagatorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class TraceContextPropagatorModel {
@Override
public String toString() {
- return "TraceContextPropagatorModel{" + "}";
+ return "TraceContextPropagatorModel{}";
}
@Override
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 a910dc93aaf..f03037a5291 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"ratio"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class TraceIdRatioBasedSamplerModel {
@Nullable private Double ratio;
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 9d3ec148993..10f7d747775 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
@@ -21,7 +21,7 @@
"id_generator",
"tracer_configurator/development"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class TracerProviderModel {
@Nullable private List processors;
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 91eabfd4d54..9b1876d1cb0 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"selector", "stream"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ViewModel {
@Nullable private ViewSelectorModel selector;
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 4a01559c3fb..18cb4a59335 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
@@ -5,13 +5,9 @@
package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model;
-import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
import javax.annotation.Generated;
import javax.annotation.Nullable;
@@ -24,11 +20,11 @@
"meter_version",
"meter_schema_url"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ViewSelectorModel {
@Nullable private String instrumentName;
- @Nullable private ViewSelectorModel.InstrumentType instrumentType;
+ @Nullable private InstrumentTypeModel instrumentType;
@Nullable private String unit;
@Nullable private String meterName;
@Nullable private String meterVersion;
@@ -74,12 +70,12 @@ public ViewSelectorModel withInstrumentName(String instrumentName) {
*/
@JsonProperty("instrument_type")
@Nullable
- public ViewSelectorModel.InstrumentType getInstrumentType() {
+ public InstrumentTypeModel getInstrumentType() {
return instrumentType;
}
@JsonProperty("instrument_type")
- public ViewSelectorModel withInstrumentType(ViewSelectorModel.InstrumentType instrumentType) {
+ public ViewSelectorModel withInstrumentType(InstrumentTypeModel instrumentType) {
this.instrumentType = instrumentType;
return this;
}
@@ -214,48 +210,4 @@ public boolean equals(@Nullable Object o) {
}
return false;
}
-
- @Generated("jsonschema2pojo")
- public enum InstrumentType {
- COUNTER("counter"),
- GAUGE("gauge"),
- HISTOGRAM("histogram"),
- OBSERVABLE_COUNTER("observable_counter"),
- OBSERVABLE_GAUGE("observable_gauge"),
- OBSERVABLE_UP_DOWN_COUNTER("observable_up_down_counter"),
- UP_DOWN_COUNTER("up_down_counter");
- private final String value;
- private static final Map CONSTANTS =
- new HashMap();
-
- static {
- for (ViewSelectorModel.InstrumentType c : values()) {
- CONSTANTS.put(c.value, c);
- }
- }
-
- InstrumentType(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-
- @JsonValue
- public String value() {
- return this.value;
- }
-
- @JsonCreator
- public static ViewSelectorModel.InstrumentType fromValue(String value) {
- ViewSelectorModel.InstrumentType constant = CONSTANTS.get(value);
- if (constant == null) {
- throw new IllegalArgumentException(value);
- } else {
- return constant;
- }
- }
- }
}
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 48c89179b78..124b0ccf4b4 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
@@ -19,7 +19,7 @@
"aggregation_cardinality_limit",
"attribute_keys"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ViewStreamModel {
@Nullable private String name;
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 8cfd2d22616..07c43713f4a 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"semconv"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalCodeInstrumentationModel {
@Nullable private ExperimentalSemconvConfigModel semconv;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableAlwaysOffSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableAlwaysOffSamplerModel.java
index 3ea289e91da..7f17846dc69 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableAlwaysOffSamplerModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableAlwaysOffSamplerModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableAlwaysOffSamplerModel {
@Override
public String toString() {
- return "ExperimentalComposableAlwaysOffSamplerModel{" + "}";
+ return "ExperimentalComposableAlwaysOffSamplerModel{}";
}
@Override
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableAlwaysOnSamplerModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableAlwaysOnSamplerModel.java
index 4de4a41c162..116cc0e819f 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableAlwaysOnSamplerModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableAlwaysOnSamplerModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableAlwaysOnSamplerModel {
@Override
public String toString() {
- return "ExperimentalComposableAlwaysOnSamplerModel{" + "}";
+ return "ExperimentalComposableAlwaysOnSamplerModel{}";
}
@Override
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 a26643a9e60..d171cd4f5a9 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"root"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableParentThresholdSamplerModel {
@Nullable private ExperimentalComposableSamplerModel root;
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 eee37559579..4e919875b41 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"ratio"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableProbabilitySamplerModel {
@Nullable private Double ratio;
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 ec37edbe185..7ca8674a0bb 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"rules"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableRuleBasedSamplerModel {
@Nullable private List rules;
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 8b1487e3e57..e53b3d37262 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"key", "included", "excluded"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel {
@Nullable private String key;
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 86243875f3b..730abbf2cab 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"key", "values"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel {
@Nullable private String key;
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 d2740e21509..355557f3485 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
@@ -8,19 +8,14 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanKind;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanKindModel;
import java.util.List;
import javax.annotation.Generated;
import javax.annotation.Nullable;
-/**
- * A rule for ExperimentalComposableRuleBasedSampler. A rule can have multiple match conditions -
- * the sampler will be applied if all match. If no conditions are specified, the rule matches all
- * spans that reach it.
- */
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"attribute_values", "attribute_patterns", "span_kinds", "parent", "sampler"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableRuleBasedSamplerRuleModel {
@Nullable private ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel attributeValues;
@@ -28,8 +23,8 @@ public class ExperimentalComposableRuleBasedSamplerRuleModel {
@Nullable
private ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel attributePatterns;
- @Nullable private List spanKinds;
- @Nullable private List parent;
+ @Nullable private List spanKinds;
+ @Nullable private List parent;
@Nullable private ExperimentalComposableSamplerModel sampler;
/**
@@ -99,12 +94,13 @@ public ExperimentalComposableRuleBasedSamplerRuleModel withAttributePatterns(
*/
@JsonProperty("span_kinds")
@Nullable
- public List getSpanKinds() {
+ public List getSpanKinds() {
return spanKinds;
}
@JsonProperty("span_kinds")
- public ExperimentalComposableRuleBasedSamplerRuleModel withSpanKinds(List spanKinds) {
+ public ExperimentalComposableRuleBasedSamplerRuleModel withSpanKinds(
+ List spanKinds) {
this.spanKinds = spanKinds;
return this;
}
@@ -124,13 +120,13 @@ public ExperimentalComposableRuleBasedSamplerRuleModel withSpanKinds(List getParent() {
+ public List getParent() {
return parent;
}
@JsonProperty("parent")
public ExperimentalComposableRuleBasedSamplerRuleModel withParent(
- List parent) {
+ List parent) {
this.parent = parent;
return this;
}
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 bdbca189db3..f955f649cce 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
@@ -17,7 +17,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"always_off", "always_on", "parent_threshold", "probability", "rule_based"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableSamplerModel {
@Nullable private ExperimentalComposableAlwaysOffSamplerModel alwaysOff;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableSamplerPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableSamplerPropertyModel.java
index b73c51b586e..ef7fa91feea 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableSamplerPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalComposableSamplerPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalComposableSamplerPropertyModel {
private Map additionalProperties = new LinkedHashMap();
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalContainerResourceDetectorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalContainerResourceDetectorModel.java
index e992be930ab..45bfa381afc 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalContainerResourceDetectorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalContainerResourceDetectorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalContainerResourceDetectorModel {
@Override
public String toString() {
- return "ExperimentalContainerResourceDetectorModel{" + "}";
+ return "ExperimentalContainerResourceDetectorModel{}";
}
@Override
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 8e4ae27cd32..8f4fe65fcdb 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"semconv"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalDbInstrumentationModel {
@Nullable private ExperimentalSemconvConfigModel semconv;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalEventToSpanEventBridgeLogRecordProcessorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalEventToSpanEventBridgeLogRecordProcessorModel.java
index 8eca0619ac4..23a9ff340c1 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalEventToSpanEventBridgeLogRecordProcessorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalEventToSpanEventBridgeLogRecordProcessorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalEventToSpanEventBridgeLogRecordProcessorModel {
@Override
public String toString() {
- return "ExperimentalEventToSpanEventBridgeLogRecordProcessorModel{" + "}";
+ return "ExperimentalEventToSpanEventBridgeLogRecordProcessorModel{}";
}
@Override
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 d3d8a667c36..c4fcc75fc00 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"semconv"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalGenAiInstrumentationModel {
@Nullable private ExperimentalSemconvConfigModel semconv;
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 19503c79b36..4e283f5596e 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
@@ -22,7 +22,7 @@
"sanitization",
"stability_opt_in_list"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalGeneralInstrumentationModel {
@Nullable private ExperimentalHttpInstrumentationModel http;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHostResourceDetectorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHostResourceDetectorModel.java
index eac3b411056..f0f096458ff 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHostResourceDetectorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalHostResourceDetectorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalHostResourceDetectorModel {
@Override
public String toString() {
- return "ExperimentalHostResourceDetectorModel{" + "}";
+ return "ExperimentalHostResourceDetectorModel{}";
}
@Override
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 bca6ecfd4ba..37963e540ca 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"request_captured_headers", "response_captured_headers", "known_methods"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalHttpClientInstrumentationModel {
@Nullable private List requestCapturedHeaders;
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 ac56ff11b04..c8b5d833c7d 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"semconv", "client", "server"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalHttpInstrumentationModel {
@Nullable private ExperimentalSemconvConfigModel semconv;
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 b672e8b0f1a..cbdd8a795af 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"request_captured_headers", "response_captured_headers", "known_methods"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalHttpServerInstrumentationModel {
@Nullable private List requestCapturedHeaders;
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 ee41546080c..1d707763dcc 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
@@ -15,7 +15,7 @@
@JsonPropertyOrder({
"general", "cpp", "dotnet", "erlang", "go", "java", "js", "php", "python", "ruby", "rust", "swift"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalInstrumentationModel {
@Nullable private ExperimentalGeneralInstrumentationModel general;
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 8917ba7b8c4..d7ba1e0e1a5 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"endpoint", "interval", "initial_sampler"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalJaegerRemoteSamplerModel {
@Nullable private String endpoint;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLanguageSpecificInstrumentationModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLanguageSpecificInstrumentationModel.java
index d7c7cb8d6df..4a0958b2368 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLanguageSpecificInstrumentationModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLanguageSpecificInstrumentationModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalLanguageSpecificInstrumentationModel {
private Map
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLanguageSpecificInstrumentationPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLanguageSpecificInstrumentationPropertyModel.java
index 92fd9617272..6929547e1b5 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLanguageSpecificInstrumentationPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalLanguageSpecificInstrumentationPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalLanguageSpecificInstrumentationPropertyModel {
private Map additionalProperties = new LinkedHashMap();
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 1b2638a0223..a2d960ecac8 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
@@ -8,21 +8,17 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SeverityNumberModel;
import javax.annotation.Generated;
import javax.annotation.Nullable;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"enabled", "minimum_severity", "trace_based"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalLoggerConfigModel {
@Nullable private Boolean enabled;
-
- @Nullable
- private io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel
- .SeverityNumber
- minimumSeverity;
-
+ @Nullable private SeverityNumberModel minimumSeverity;
@Nullable private Boolean traceBased;
/**
@@ -102,17 +98,12 @@ public ExperimentalLoggerConfigModel withEnabled(Boolean enabled) {
*/
@JsonProperty("minimum_severity")
@Nullable
- public io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel
- .SeverityNumber
- getMinimumSeverity() {
+ public SeverityNumberModel getMinimumSeverity() {
return minimumSeverity;
}
@JsonProperty("minimum_severity")
- public ExperimentalLoggerConfigModel withMinimumSeverity(
- io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel
- .SeverityNumber
- minimumSeverity) {
+ public ExperimentalLoggerConfigModel withMinimumSeverity(SeverityNumberModel minimumSeverity) {
this.minimumSeverity = minimumSeverity;
return this;
}
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 f58fc4ccaec..2c227307318 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"default_config", "loggers"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalLoggerConfiguratorModel {
@Nullable private ExperimentalLoggerConfigModel defaultConfig;
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 d05c6f2b4f8..52cfa1d0520 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"name", "config"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalLoggerMatcherAndConfigModel {
@Nullable private String name;
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 aba3036b0cc..58fe0673408 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"semconv"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalMessagingInstrumentationModel {
@Nullable private ExperimentalSemconvConfigModel semconv;
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 940159b832d..b9476414d20 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"enabled"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalMeterConfigModel {
@Nullable private Boolean enabled;
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 1614d4bbf61..0a172f735e6 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"default_config", "meters"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalMeterConfiguratorModel {
@Nullable private ExperimentalMeterConfigModel defaultConfig;
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 c0cd4182a0b..6ef5e440afe 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"name", "config"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalMeterMatcherAndConfigModel {
@Nullable private String name;
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 6632dffa80f..5b580c59e75 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"output_stream"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalOtlpFileExporterModel {
@Nullable private String outputStream;
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 c067676d7fb..bd728f2daea 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
@@ -8,25 +8,19 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExporterDefaultHistogramAggregationModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExporterTemporalityPreferenceModel;
import javax.annotation.Generated;
import javax.annotation.Nullable;
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"output_stream", "temporality_preference", "default_histogram_aggregation"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalOtlpFileMetricExporterModel {
@Nullable private String outputStream;
-
- @Nullable
- private io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel
- .ExporterTemporalityPreference
- temporalityPreference;
-
- @Nullable
- private io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel
- .ExporterDefaultHistogramAggregation
- defaultHistogramAggregation;
+ @Nullable private ExporterTemporalityPreferenceModel temporalityPreference;
+ @Nullable private ExporterDefaultHistogramAggregationModel defaultHistogramAggregation;
/**
* Configure output stream.
@@ -64,17 +58,13 @@ public ExperimentalOtlpFileMetricExporterModel withOutputStream(String outputStr
*/
@JsonProperty("temporality_preference")
@Nullable
- public io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel
- .ExporterTemporalityPreference
- getTemporalityPreference() {
+ public ExporterTemporalityPreferenceModel getTemporalityPreference() {
return temporalityPreference;
}
@JsonProperty("temporality_preference")
public ExperimentalOtlpFileMetricExporterModel withTemporalityPreference(
- io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel
- .ExporterTemporalityPreference
- temporalityPreference) {
+ ExporterTemporalityPreferenceModel temporalityPreference) {
this.temporalityPreference = temporalityPreference;
return this;
}
@@ -94,17 +84,13 @@ public ExperimentalOtlpFileMetricExporterModel withTemporalityPreference(
*/
@JsonProperty("default_histogram_aggregation")
@Nullable
- public io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel
- .ExporterDefaultHistogramAggregation
- getDefaultHistogramAggregation() {
+ public ExporterDefaultHistogramAggregationModel getDefaultHistogramAggregation() {
return defaultHistogramAggregation;
}
@JsonProperty("default_histogram_aggregation")
public ExperimentalOtlpFileMetricExporterModel withDefaultHistogramAggregation(
- io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel
- .ExporterDefaultHistogramAggregation
- defaultHistogramAggregation) {
+ ExporterDefaultHistogramAggregationModel defaultHistogramAggregation) {
this.defaultHistogramAggregation = defaultHistogramAggregation;
return this;
}
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 d497930f482..dea525bd6b0 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"ratio"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalProbabilitySamplerModel {
@Nullable private Double ratio;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalProcessResourceDetectorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalProcessResourceDetectorModel.java
index 2fc2bfb4ad4..3807471f7bb 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalProcessResourceDetectorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalProcessResourceDetectorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalProcessResourceDetectorModel {
@Override
public String toString() {
- return "ExperimentalProcessResourceDetectorModel{" + "}";
+ return "ExperimentalProcessResourceDetectorModel{}";
}
@Override
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 61389fc8fa6..f67ff312f39 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
@@ -5,14 +5,10 @@
package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal;
-import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel;
-import java.util.HashMap;
-import java.util.Map;
import javax.annotation.Generated;
import javax.annotation.Nullable;
@@ -25,7 +21,7 @@
"resource_constant_labels",
"translation_strategy"
})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalPrometheusMetricExporterModel {
@Nullable private String host;
@@ -33,10 +29,7 @@ public class ExperimentalPrometheusMetricExporterModel {
@Nullable private Boolean scopeInfoEnabled;
@Nullable private Boolean targetInfoEnabledDevelopment;
@Nullable private IncludeExcludeModel resourceConstantLabels;
-
- @Nullable
- private ExperimentalPrometheusMetricExporterModel.ExperimentalPrometheusTranslationStrategy
- translationStrategy;
+ @Nullable private ExperimentalPrometheusTranslationStrategyModel translationStrategy;
/**
* Configure host.
@@ -148,15 +141,13 @@ public ExperimentalPrometheusMetricExporterModel withResourceConstantLabels(
*/
@JsonProperty("translation_strategy")
@Nullable
- public ExperimentalPrometheusMetricExporterModel.ExperimentalPrometheusTranslationStrategy
- getTranslationStrategy() {
+ public ExperimentalPrometheusTranslationStrategyModel getTranslationStrategy() {
return translationStrategy;
}
@JsonProperty("translation_strategy")
public ExperimentalPrometheusMetricExporterModel withTranslationStrategy(
- ExperimentalPrometheusMetricExporterModel.ExperimentalPrometheusTranslationStrategy
- translationStrategy) {
+ ExperimentalPrometheusTranslationStrategyModel translationStrategy) {
this.translationStrategy = translationStrategy;
return this;
}
@@ -225,56 +216,4 @@ public boolean equals(@Nullable Object o) {
}
return false;
}
-
- @Generated("jsonschema2pojo")
- public enum ExperimentalPrometheusTranslationStrategy {
- UNDERSCORE_ESCAPING_WITH_SUFFIXES("underscore_escaping_with_suffixes"),
- UNDERSCORE_ESCAPING_WITHOUT_SUFFIXES_DEVELOPMENT(
- "underscore_escaping_without_suffixes/development"),
- NO_UTF_8_ESCAPING_WITH_SUFFIXES_DEVELOPMENT("no_utf8_escaping_with_suffixes/development"),
- NO_TRANSLATION_DEVELOPMENT("no_translation/development");
- private final String value;
- private static final Map<
- String,
- ExperimentalPrometheusMetricExporterModel.ExperimentalPrometheusTranslationStrategy>
- CONSTANTS =
- new HashMap<
- String,
- ExperimentalPrometheusMetricExporterModel
- .ExperimentalPrometheusTranslationStrategy>();
-
- static {
- for (ExperimentalPrometheusMetricExporterModel.ExperimentalPrometheusTranslationStrategy c :
- values()) {
- CONSTANTS.put(c.value, c);
- }
- }
-
- ExperimentalPrometheusTranslationStrategy(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.value;
- }
-
- @JsonValue
- public String value() {
- return this.value;
- }
-
- @JsonCreator
- public static ExperimentalPrometheusMetricExporterModel
- .ExperimentalPrometheusTranslationStrategy
- fromValue(String value) {
- ExperimentalPrometheusMetricExporterModel.ExperimentalPrometheusTranslationStrategy constant =
- CONSTANTS.get(value);
- if (constant == null) {
- throw new IllegalArgumentException(value);
- } else {
- return constant;
- }
- }
- }
}
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalPrometheusTranslationStrategyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalPrometheusTranslationStrategyModel.java
new file mode 100644
index 00000000000..f3018034e2d
--- /dev/null
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalPrometheusTranslationStrategyModel.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum ExperimentalPrometheusTranslationStrategyModel {
+ UNDERSCORE_ESCAPING_WITH_SUFFIXES("underscore_escaping_with_suffixes"),
+ UNDERSCORE_ESCAPING_WITHOUT_SUFFIXES_DEVELOPMENT(
+ "underscore_escaping_without_suffixes/development"),
+ NO_UTF_8_ESCAPING_WITH_SUFFIXES_DEVELOPMENT("no_utf8_escaping_with_suffixes/development"),
+ NO_TRANSLATION_DEVELOPMENT("no_translation/development");
+ private final String value;
+ private static final Map CONSTANTS =
+ new HashMap();
+
+ static {
+ for (ExperimentalPrometheusTranslationStrategyModel c : values()) {
+ CONSTANTS.put(c.value, c);
+ }
+ }
+
+ ExperimentalPrometheusTranslationStrategyModel(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return this.value;
+ }
+
+ @JsonValue
+ public String value() {
+ return this.value;
+ }
+
+ @JsonCreator
+ public static ExperimentalPrometheusTranslationStrategyModel fromValue(String value) {
+ ExperimentalPrometheusTranslationStrategyModel constant = CONSTANTS.get(value);
+ if (constant == null) {
+ throw new IllegalArgumentException(value);
+ } else {
+ return constant;
+ }
+ }
+}
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 4ddf3d90c48..49d1f57675c 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
@@ -15,7 +15,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"attributes", "detectors"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalResourceDetectionModel {
@Nullable private IncludeExcludeModel attributes;
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 0df609dc6d1..f63679b27ed 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
@@ -17,7 +17,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"container", "host", "process", "service"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalResourceDetectorModel {
@Nullable private ExperimentalContainerResourceDetectorModel container;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectorPropertyModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectorPropertyModel.java
index 7655ba15fd7..fb72febd900 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectorPropertyModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalResourceDetectorPropertyModel.java
@@ -16,7 +16,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalResourceDetectorPropertyModel {
private Map additionalProperties = new LinkedHashMap();
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 39783424087..e7f43c62649 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"semconv"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalRpcInstrumentationModel {
@Nullable private ExperimentalSemconvConfigModel semconv;
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 6dc337af999..ee0f7945710 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"url"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalSanitizationModel {
@Nullable private ExperimentalUrlSanitizationModel url;
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 235a7dd55ff..dda4fda685a 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"version", "experimental", "dual_emit"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalSemconvConfigModel {
@Nullable private Integer version;
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalServiceResourceDetectorModel.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalServiceResourceDetectorModel.java
index bc8cf98baf0..26305c126d8 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalServiceResourceDetectorModel.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalServiceResourceDetectorModel.java
@@ -12,12 +12,12 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalServiceResourceDetectorModel {
@Override
public String toString() {
- return "ExperimentalServiceResourceDetectorModel{" + "}";
+ return "ExperimentalServiceResourceDetectorModel{}";
}
@Override
diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSpanParent.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSpanParentModel.java
similarity index 62%
rename from sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSpanParent.java
rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSpanParentModel.java
index 0d170fa274f..5ae4f3e3a08 100644
--- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSpanParent.java
+++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/internal/ExperimentalSpanParentModel.java
@@ -11,22 +11,22 @@
import java.util.Map;
import javax.annotation.Generated;
-@Generated("jsonschema2pojo")
-public enum ExperimentalSpanParent {
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
+public enum ExperimentalSpanParentModel {
NONE("none"),
REMOTE("remote"),
LOCAL("local");
private final String value;
- private static final Map CONSTANTS =
- new HashMap();
+ private static final Map CONSTANTS =
+ new HashMap();
static {
- for (ExperimentalSpanParent c : values()) {
+ for (ExperimentalSpanParentModel c : values()) {
CONSTANTS.put(c.value, c);
}
}
- ExperimentalSpanParent(String value) {
+ ExperimentalSpanParentModel(String value) {
this.value = value;
}
@@ -41,8 +41,8 @@ public String value() {
}
@JsonCreator
- public static ExperimentalSpanParent fromValue(String value) {
- ExperimentalSpanParent constant = CONSTANTS.get(value);
+ public static ExperimentalSpanParentModel fromValue(String value) {
+ ExperimentalSpanParentModel constant = CONSTANTS.get(value);
if (constant == null) {
throw new IllegalArgumentException(value);
} else {
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 088db61425c..a6ee3e766a6 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"enabled"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalTracerConfigModel {
@Nullable private Boolean enabled;
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 046a71bceb2..9ba9c4423a4 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"default_config", "tracers"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalTracerConfiguratorModel {
@Nullable private ExperimentalTracerConfigModel defaultConfig;
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 0a9256328f4..3c25ca89c8c 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
@@ -13,7 +13,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"name", "config"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalTracerMatcherAndConfigModel {
@Nullable private String name;
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 57dfdd87790..1de232b0026 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
@@ -14,7 +14,7 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({"sensitive_query_parameters"})
-@Generated("jsonschema2pojo")
+@Generated("io.opentelemetry.gradle.DeclarativeConfigPojoGenerator")
public class ExperimentalUrlSanitizationModel {
@Nullable private List sensitiveQueryParameters;
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactoryTest.java
index 9a81a28de6c..65a316fe795 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactoryTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactoryTest.java
@@ -12,6 +12,7 @@
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeTypeModel;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -50,7 +51,7 @@ private static Stream invalidAttributes() {
Collections.singletonList(
new AttributeNameValueModel()
.withName("key")
- .withType(AttributeNameValueModel.AttributeType.INT)
+ .withType(AttributeTypeModel.INT)
.withValue(Arrays.asList(1L, 1))),
"Error processing attribute with name \"key\": value did not match type INT"),
Arguments.argumentSet(
@@ -58,7 +59,7 @@ private static Stream invalidAttributes() {
Collections.singletonList(
new AttributeNameValueModel()
.withName("key")
- .withType(AttributeNameValueModel.AttributeType.INT)
+ .withType(AttributeTypeModel.INT)
.withValue(true)),
"Error processing attribute with name \"key\": value did not match type INT"));
}
@@ -91,51 +92,51 @@ void create() {
new AttributeNameValueModel()
.withName("strKey")
.withValue("val")
- .withType(AttributeNameValueModel.AttributeType.STRING),
+ .withType(AttributeTypeModel.STRING),
new AttributeNameValueModel()
.withName("longKey")
.withValue(1L)
- .withType(AttributeNameValueModel.AttributeType.INT),
+ .withType(AttributeTypeModel.INT),
new AttributeNameValueModel()
.withName("intKey")
.withValue(2)
- .withType(AttributeNameValueModel.AttributeType.INT),
+ .withType(AttributeTypeModel.INT),
new AttributeNameValueModel()
.withName("doubleKey")
.withValue(1.0d)
- .withType(AttributeNameValueModel.AttributeType.DOUBLE),
+ .withType(AttributeTypeModel.DOUBLE),
new AttributeNameValueModel()
.withName("floatKey")
.withValue(2.0f)
- .withType(AttributeNameValueModel.AttributeType.DOUBLE),
+ .withType(AttributeTypeModel.DOUBLE),
new AttributeNameValueModel()
.withName("boolKey")
.withValue(true)
- .withType(AttributeNameValueModel.AttributeType.BOOL),
+ .withType(AttributeTypeModel.BOOL),
new AttributeNameValueModel()
.withName("strArrKey")
.withValue(Arrays.asList("val1", "val2"))
- .withType(AttributeNameValueModel.AttributeType.STRING_ARRAY),
+ .withType(AttributeTypeModel.STRING_ARRAY),
new AttributeNameValueModel()
.withName("longArrKey")
.withValue(Arrays.asList(1L, 2L))
- .withType(AttributeNameValueModel.AttributeType.INT_ARRAY),
+ .withType(AttributeTypeModel.INT_ARRAY),
new AttributeNameValueModel()
.withName("intArrKey")
.withValue(Arrays.asList(1, 2))
- .withType(AttributeNameValueModel.AttributeType.INT_ARRAY),
+ .withType(AttributeTypeModel.INT_ARRAY),
new AttributeNameValueModel()
.withName("doubleArrKey")
.withValue(Arrays.asList(1.0d, 2.0d))
- .withType(AttributeNameValueModel.AttributeType.DOUBLE_ARRAY),
+ .withType(AttributeTypeModel.DOUBLE_ARRAY),
new AttributeNameValueModel()
.withName("floatArrKey")
.withValue(Arrays.asList(1.0f, 2.0f))
- .withType(AttributeNameValueModel.AttributeType.DOUBLE_ARRAY),
+ .withType(AttributeTypeModel.DOUBLE_ARRAY),
new AttributeNameValueModel()
.withName("boolArrKey")
.withValue(Arrays.asList(true, false))
- .withType(AttributeNameValueModel.AttributeType.BOOL_ARRAY)),
+ .withType(AttributeTypeModel.BOOL_ARRAY)),
mock(DeclarativeConfigContext.class)))
.isEqualTo(expectedAttributes);
}
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java
index 6e33cae7b7d..a44e86182fc 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java
@@ -20,13 +20,14 @@
import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.TraceFlags;
import io.opentelemetry.api.trace.TraceState;
import io.opentelemetry.common.ComponentLoader;
import io.opentelemetry.context.Context;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.ComposableRuleBasedSamplerFactory.AttributeMatcher;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.ComposableRuleBasedSamplerFactory.DeclarativeConfigSamplingPredicate;
-import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanKind;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanKindModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableAlwaysOffSamplerModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableAlwaysOnSamplerModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableProbabilitySamplerModel;
@@ -35,7 +36,7 @@
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableRuleBasedSamplerRuleModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalComposableSamplerModel;
-import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalSpanParent;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalSpanParentModel;
import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate;
import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler;
import io.opentelemetry.sdk.trace.IdGenerator;
@@ -192,8 +193,8 @@ private static Stream createTestCases() {
.withAlwaysOn(
new ExperimentalComposableAlwaysOnSamplerModel())),
new ExperimentalComposableRuleBasedSamplerRuleModel()
- .withParent(Collections.singletonList(ExperimentalSpanParent.NONE))
- .withSpanKinds(Collections.singletonList(SpanKind.CLIENT))
+ .withParent(Collections.singletonList(ExperimentalSpanParentModel.NONE))
+ .withSpanKinds(Collections.singletonList(SpanKindModel.CLIENT))
.withSampler(
new ExperimentalComposableSamplerModel()
.withProbability(
@@ -231,7 +232,7 @@ private static Stream createTestCases() {
new DeclarativeConfigSamplingPredicate(
null,
null,
- Collections.singleton(ExperimentalSpanParent.NONE),
+ Collections.singleton(ExperimentalSpanParentModel.NONE),
Collections.singleton(CLIENT)),
ComposableSampler.probability(0.05))
.add(
@@ -260,7 +261,7 @@ private static Stream createTestCases() {
TraceFlags.getDefault(),
TraceState.getDefault())));
private static final String sn = "name";
- private static final io.opentelemetry.api.trace.SpanKind sk = CLIENT;
+ private static final SpanKind sk = CLIENT;
private static final AttributeKey HTTP_ROUTE = AttributeKey.stringKey("http.route");
private static final AttributeKey HTTP_PATH = AttributeKey.stringKey("http.path");
@@ -269,7 +270,7 @@ private static Stream createTestCases() {
void declarativeConfigSamplingPredicate(
DeclarativeConfigSamplingPredicate predicate,
Context context,
- io.opentelemetry.api.trace.SpanKind spanKind,
+ SpanKind spanKind,
Attributes attributes,
boolean expectedResult) {
assertThat(predicate.matches(context, sn, spanKind, attributes, emptyList()))
@@ -301,7 +302,7 @@ private static Stream declarativeConfigSamplingPredicateArgs() {
null);
DeclarativeConfigSamplingPredicate parentMatcher =
new DeclarativeConfigSamplingPredicate(
- null, null, Collections.singleton(ExperimentalSpanParent.NONE), null);
+ null, null, Collections.singleton(ExperimentalSpanParentModel.NONE), null);
DeclarativeConfigSamplingPredicate spanKindMatcher =
new DeclarativeConfigSamplingPredicate(null, null, null, Collections.singleton(CLIENT));
DeclarativeConfigSamplingPredicate multiMatcher =
@@ -315,7 +316,7 @@ private static Stream declarativeConfigSamplingPredicateArgs() {
IncludeExcludePredicate.createPatternMatching(
Collections.singletonList("/internal/*"),
Collections.singletonList("/internal/special/*"))),
- Collections.singleton(ExperimentalSpanParent.NONE),
+ Collections.singleton(ExperimentalSpanParentModel.NONE),
Collections.singleton(CLIENT));
return Stream.of(
@@ -475,10 +476,10 @@ private static Stream declarativeConfigSamplingPredicateArgs() {
@Test
void toSpanParent_Valid() {
- assertThat(toSpanParent(SpanContext.getInvalid())).isEqualTo(ExperimentalSpanParent.NONE);
+ assertThat(toSpanParent(SpanContext.getInvalid())).isEqualTo(ExperimentalSpanParentModel.NONE);
assertThat(toSpanParent(Span.fromContext(localParent).getSpanContext()))
- .isEqualTo(ExperimentalSpanParent.LOCAL);
+ .isEqualTo(ExperimentalSpanParentModel.LOCAL);
assertThat(toSpanParent(Span.fromContext(remoteParent).getSpanContext()))
- .isEqualTo(ExperimentalSpanParent.REMOTE);
+ .isEqualTo(ExperimentalSpanParentModel.REMOTE);
}
}
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactoryTest.java
index 3bc25741efd..ba34dd72017 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactoryTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactoryTest.java
@@ -8,7 +8,7 @@
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static org.mockito.Mockito.mock;
-import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExemplarFilterModel;
import io.opentelemetry.sdk.metrics.ExemplarFilter;
import java.util.stream.Stream;
import org.junit.jupiter.params.ParameterizedTest;
@@ -19,7 +19,7 @@ class ExemplarFilterFactoryTest {
@ParameterizedTest
@MethodSource("createTestCases")
- void create(MeterProviderModel.ExemplarFilter model, ExemplarFilter expectedResult) {
+ void create(ExemplarFilterModel model, ExemplarFilter expectedResult) {
ExemplarFilter exemplarFilter =
ExemplarFilterFactory.getInstance().create(model, mock(DeclarativeConfigContext.class));
assertThat(exemplarFilter.toString()).isEqualTo(expectedResult.toString());
@@ -28,12 +28,10 @@ void create(MeterProviderModel.ExemplarFilter model, ExemplarFilter expectedResu
private static Stream createTestCases() {
return Stream.of(
Arguments.argumentSet(
- "always_on", MeterProviderModel.ExemplarFilter.ALWAYS_ON, ExemplarFilter.alwaysOn()),
+ "always_on", ExemplarFilterModel.ALWAYS_ON, ExemplarFilter.alwaysOn()),
Arguments.argumentSet(
- "always_off", MeterProviderModel.ExemplarFilter.ALWAYS_OFF, ExemplarFilter.alwaysOff()),
+ "always_off", ExemplarFilterModel.ALWAYS_OFF, ExemplarFilter.alwaysOff()),
Arguments.argumentSet(
- "trace_based",
- MeterProviderModel.ExemplarFilter.TRACE_BASED,
- ExemplarFilter.traceBased()));
+ "trace_based", ExemplarFilterModel.TRACE_BASED, ExemplarFilter.traceBased()));
}
}
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactoryTest.java
index 81abf386253..c9089ac53cf 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactoryTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactoryTest.java
@@ -10,6 +10,7 @@
import static org.mockito.Mockito.mock;
import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.InstrumentTypeModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewSelectorModel;
import io.opentelemetry.sdk.metrics.InstrumentSelector;
import io.opentelemetry.sdk.metrics.InstrumentType;
@@ -34,7 +35,7 @@ void create() {
.create(
new ViewSelectorModel()
.withInstrumentName("instrument-name")
- .withInstrumentType(ViewSelectorModel.InstrumentType.COUNTER)
+ .withInstrumentType(InstrumentTypeModel.COUNTER)
.withUnit("ms")
.withMeterName("meter-name")
.withMeterSchemaUrl("https://opentelemetry.io/schemas/1.16.0")
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactoryTest.java
index 705f8cf6c14..1336c24ebf8 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactoryTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactoryTest.java
@@ -18,8 +18,8 @@
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordLimitsModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel;
-import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel.SeverityNumber;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SeverityNumberModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLoggerConfigModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLoggerConfiguratorModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLoggerMatcherAndConfigModel;
@@ -106,7 +106,7 @@ private static Stream createArguments() {
new ExperimentalLoggerConfigModel()
.withEnabled(true)
.withTraceBased(true)
- .withMinimumSeverity(SeverityNumber.INFO)))))),
+ .withMinimumSeverity(SeverityNumberModel.INFO)))))),
setLoggerConfigurator(
SdkLoggerProvider.builder(),
ScopeConfigurator.builder()
@@ -134,35 +134,35 @@ private static Stream createArguments() {
@ParameterizedTest
@MethodSource("severityNumberArguments")
- void severityNumber(SeverityNumber model, Severity expectedSeverity) {
+ void severityNumber(SeverityNumberModel model, Severity expectedSeverity) {
assertThat(LoggerProviderFactory.severityNumberToSeverity(model)).isEqualTo(expectedSeverity);
}
private static Stream severityNumberArguments() {
return Stream.of(
- Arguments.argumentSet("TRACE", SeverityNumber.TRACE, Severity.TRACE),
- Arguments.argumentSet("TRACE_2", SeverityNumber.TRACE_2, Severity.TRACE2),
- Arguments.argumentSet("TRACE_3", SeverityNumber.TRACE_3, Severity.TRACE3),
- Arguments.argumentSet("TRACE_4", SeverityNumber.TRACE_4, Severity.TRACE4),
- Arguments.argumentSet("DEBUG", SeverityNumber.DEBUG, Severity.DEBUG),
- Arguments.argumentSet("DEBUG_2", SeverityNumber.DEBUG_2, Severity.DEBUG2),
- Arguments.argumentSet("DEBUG_3", SeverityNumber.DEBUG_3, Severity.DEBUG3),
- Arguments.argumentSet("DEBUG_4", SeverityNumber.DEBUG_4, Severity.DEBUG4),
- Arguments.argumentSet("INFO", SeverityNumber.INFO, Severity.INFO),
- Arguments.argumentSet("INFO_2", SeverityNumber.INFO_2, Severity.INFO2),
- Arguments.argumentSet("INFO_3", SeverityNumber.INFO_3, Severity.INFO3),
- Arguments.argumentSet("INFO_4", SeverityNumber.INFO_4, Severity.INFO4),
- Arguments.argumentSet("WARN", SeverityNumber.WARN, Severity.WARN),
- Arguments.argumentSet("WARN_2", SeverityNumber.WARN_2, Severity.WARN2),
- Arguments.argumentSet("WARN_3", SeverityNumber.WARN_3, Severity.WARN3),
- Arguments.argumentSet("WARN_4", SeverityNumber.WARN_4, Severity.WARN4),
- Arguments.argumentSet("ERROR", SeverityNumber.ERROR, Severity.ERROR),
- Arguments.argumentSet("ERROR_2", SeverityNumber.ERROR_2, Severity.ERROR2),
- Arguments.argumentSet("ERROR_3", SeverityNumber.ERROR_3, Severity.ERROR3),
- Arguments.argumentSet("ERROR_4", SeverityNumber.ERROR_4, Severity.ERROR4),
- Arguments.argumentSet("FATAL", SeverityNumber.FATAL, Severity.FATAL),
- Arguments.argumentSet("FATAL_2", SeverityNumber.FATAL_2, Severity.FATAL2),
- Arguments.argumentSet("FATAL_3", SeverityNumber.FATAL_3, Severity.FATAL3),
- Arguments.argumentSet("FATAL_4", SeverityNumber.FATAL_4, Severity.FATAL4));
+ Arguments.argumentSet("TRACE", SeverityNumberModel.TRACE, Severity.TRACE),
+ Arguments.argumentSet("TRACE_2", SeverityNumberModel.TRACE_2, Severity.TRACE2),
+ Arguments.argumentSet("TRACE_3", SeverityNumberModel.TRACE_3, Severity.TRACE3),
+ Arguments.argumentSet("TRACE_4", SeverityNumberModel.TRACE_4, Severity.TRACE4),
+ Arguments.argumentSet("DEBUG", SeverityNumberModel.DEBUG, Severity.DEBUG),
+ Arguments.argumentSet("DEBUG_2", SeverityNumberModel.DEBUG_2, Severity.DEBUG2),
+ Arguments.argumentSet("DEBUG_3", SeverityNumberModel.DEBUG_3, Severity.DEBUG3),
+ Arguments.argumentSet("DEBUG_4", SeverityNumberModel.DEBUG_4, Severity.DEBUG4),
+ Arguments.argumentSet("INFO", SeverityNumberModel.INFO, Severity.INFO),
+ Arguments.argumentSet("INFO_2", SeverityNumberModel.INFO_2, Severity.INFO2),
+ Arguments.argumentSet("INFO_3", SeverityNumberModel.INFO_3, Severity.INFO3),
+ Arguments.argumentSet("INFO_4", SeverityNumberModel.INFO_4, Severity.INFO4),
+ Arguments.argumentSet("WARN", SeverityNumberModel.WARN, Severity.WARN),
+ Arguments.argumentSet("WARN_2", SeverityNumberModel.WARN_2, Severity.WARN2),
+ Arguments.argumentSet("WARN_3", SeverityNumberModel.WARN_3, Severity.WARN3),
+ Arguments.argumentSet("WARN_4", SeverityNumberModel.WARN_4, Severity.WARN4),
+ Arguments.argumentSet("ERROR", SeverityNumberModel.ERROR, Severity.ERROR),
+ Arguments.argumentSet("ERROR_2", SeverityNumberModel.ERROR_2, Severity.ERROR2),
+ Arguments.argumentSet("ERROR_3", SeverityNumberModel.ERROR_3, Severity.ERROR3),
+ Arguments.argumentSet("ERROR_4", SeverityNumberModel.ERROR_4, Severity.ERROR4),
+ Arguments.argumentSet("FATAL", SeverityNumberModel.FATAL, Severity.FATAL),
+ Arguments.argumentSet("FATAL_2", SeverityNumberModel.FATAL_2, Severity.FATAL2),
+ Arguments.argumentSet("FATAL_3", SeverityNumberModel.FATAL_3, Severity.FATAL3),
+ Arguments.argumentSet("FATAL_4", SeverityNumberModel.FATAL_4, Severity.FATAL4));
}
}
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactoryTest.java
index 671e802989c..1f890776f70 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactoryTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactoryTest.java
@@ -11,6 +11,7 @@
import io.opentelemetry.common.ComponentLoader;
import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter;
import io.opentelemetry.internal.testing.CleanupExtension;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExemplarFilterModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MetricReaderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel;
@@ -100,7 +101,7 @@ private static Stream createArguments() {
.withName("foo")
.withConfig(
new ExperimentalMeterConfigModel().withEnabled(true)))))
- .withExemplarFilter(MeterProviderModel.ExemplarFilter.ALWAYS_ON),
+ .withExemplarFilter(ExemplarFilterModel.ALWAYS_ON),
setMeterConfigurator(
SdkMeterProvider.builder(),
ScopeConfigurator.builder()
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactoryTest.java
index ac2927a69ac..219ef6f0566 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactoryTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactoryTest.java
@@ -19,6 +19,8 @@
import io.opentelemetry.internal.testing.CleanupExtension;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.component.MetricExporterComponentProvider;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ConsoleMetricExporterModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExporterDefaultHistogramAggregationModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExporterTemporalityPreferenceModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.GrpcTlsModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.HttpTlsModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.NameStringValuePairModel;
@@ -119,10 +121,9 @@ Stream createTestCases() {
.withCaFile(certificatePath)
.withKeyFile(clientKeyPath)
.withCertFile(clientCertificatePath))
- .withTemporalityPreference(
- OtlpHttpMetricExporterModel.ExporterTemporalityPreference.DELTA)
+ .withTemporalityPreference(ExporterTemporalityPreferenceModel.DELTA)
.withDefaultHistogramAggregation(
- OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation
+ ExporterDefaultHistogramAggregationModel
.BASE_2_EXPONENTIAL_BUCKET_HISTOGRAM)),
OtlpHttpMetricExporter.builder()
.setEndpoint("http://example:4318/v1/metrics")
@@ -161,10 +162,9 @@ Stream createTestCases() {
.withCaFile(certificatePath)
.withKeyFile(clientKeyPath)
.withCertFile(clientCertificatePath))
- .withTemporalityPreference(
- OtlpHttpMetricExporterModel.ExporterTemporalityPreference.DELTA)
+ .withTemporalityPreference(ExporterTemporalityPreferenceModel.DELTA)
.withDefaultHistogramAggregation(
- OtlpHttpMetricExporterModel.ExporterDefaultHistogramAggregation
+ ExporterDefaultHistogramAggregationModel
.BASE_2_EXPONENTIAL_BUCKET_HISTOGRAM)),
OtlpGrpcMetricExporter.builder()
.setEndpoint("http://example:4317")
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactoryTest.java
index 2b57e9e899b..38c9c4e4bb0 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactoryTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactoryTest.java
@@ -29,6 +29,7 @@
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PullMetricReaderModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalPrometheusMetricExporterModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalPrometheusTranslationStrategyModel;
import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate;
import io.opentelemetry.sdk.metrics.InstrumentType;
import io.opentelemetry.sdk.metrics.export.MetricReader;
@@ -186,8 +187,7 @@ static Stream createTestCases() throws IOException {
.withScopeInfoEnabled(false)
.withTargetInfoEnabledDevelopment(false)
.withTranslationStrategy(
- ExperimentalPrometheusMetricExporterModel
- .ExperimentalPrometheusTranslationStrategy
+ ExperimentalPrometheusTranslationStrategyModel
.UNDERSCORE_ESCAPING_WITHOUT_SUFFIXES_DEVELOPMENT)))),
prom2Expected,
100,
@@ -214,8 +214,7 @@ static Stream createTestCases() throws IOException {
.withHost("localhost")
.withPort(prom3Port)
.withTranslationStrategy(
- ExperimentalPrometheusMetricExporterModel
- .ExperimentalPrometheusTranslationStrategy
+ ExperimentalPrometheusTranslationStrategyModel
.NO_TRANSLATION_DEVELOPMENT)))),
prom3Expected,
null,
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java
index dce74bc06a9..59fd6a60f12 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java
@@ -6,6 +6,7 @@
package io.opentelemetry.sdk.autoconfigure.declarativeconfig;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel;
+import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeTypeModel;
import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel;
import java.util.ArrayList;
import java.util.List;
@@ -30,12 +31,12 @@ public void customize(DeclarativeConfigurationCustomizer customizer) {
attributes.add(
new AttributeNameValueModel()
.withName("foo")
- .withType(AttributeNameValueModel.AttributeType.STRING)
+ .withType(AttributeTypeModel.STRING)
.withValue("bar"));
attributes.add(
new AttributeNameValueModel()
.withName("color")
- .withType(AttributeNameValueModel.AttributeType.STRING)
+ .withType(AttributeTypeModel.STRING)
.withValue("blue"));
return model;
});
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ModelEqualsHashCodeTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ModelEqualsHashCodeTest.java
index 14e1ac630c3..09a7047675d 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ModelEqualsHashCodeTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ModelEqualsHashCodeTest.java
@@ -20,9 +20,9 @@
/**
* Verifies the {@code equals}/{@code hashCode} contract for every generated model POJO. The models
- * and their {@code equals}/{@code hashCode} implementations are generated (see {@code
- * io.opentelemetry.gradle.js2p.OtelObjectRule}), so this test guards the generator output rather
- * than any hand-written code.
+ * and their {@code equals}/{@code hashCode} implementations are generated by {@code
+ * io.opentelemetry.gradle.DeclarativeConfigPojoGenerator}, so this test guards the generator output
+ * rather than any hand-written code.
*/
class ModelEqualsHashCodeTest {
@@ -68,9 +68,10 @@ static Stream modelClasses() throws IOException {
.getTopLevelClassesRecursive(MODEL_PACKAGE)
.stream()
.map(ClassPath.ClassInfo::load)
- // The "Model" suffix (jsonschema2pojo classNameSuffix) selects the generated POJOs and
- // excludes generated enums and this test class, which share the package.
- .filter(clazz -> clazz.getSimpleName().endsWith("Model"))
+ // All generated types (both classes and enums) carry the "Model" suffix. Enums have a
+ // correct-by-construction equals/hashCode (identity), so only non-enum Model classes need
+ // EqualsVerifier coverage.
+ .filter(clazz -> clazz.getSimpleName().endsWith("Model") && !clazz.isEnum())
.sorted(Comparator.comparing(Class::getSimpleName))
.map(clazz -> Arguments.argumentSet(clazz.getSimpleName(), clazz));
}
diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ModelPackageBoundaryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ModelPackageBoundaryTest.java
index aa2d06c5c10..731d5fbd82f 100644
--- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ModelPackageBoundaryTest.java
+++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/model/ModelPackageBoundaryTest.java
@@ -18,9 +18,9 @@
*
* Experimental (unstable) types must live in {@code MODEL_PACKAGE.internal} (exempt from the
* stability guarantees in {@code VERSIONING.md}) and stable types in {@code MODEL_PACKAGE}. The
- * generator enforces this by routing types whose name starts with {@code Experimental} (see {@code
- * io.opentelemetry.gradle.js2p.ExperimentalPackages}). This test fails if a schema update or rename
- * ever breaks that invariant — e.g. leaking a mutable experimental type into the stable public API.
+ * generator enforces this by routing types whose name starts with {@code Experimental} into the
+ * internal sub-package. This test fails if a schema update or rename ever breaks that invariant
+ * — e.g. leaking a mutable experimental type into the stable public API.
*/
class ModelPackageBoundaryTest {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ecf00356d5c..df5009f24b8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,7 +3,6 @@ pluginManagement {
id("com.gradleup.shadow") version "9.5.1"
id("com.gradle.develocity") version "4.5.0"
id("de.undercouch.download") version "5.7.0"
- id("org.jsonschema2pojo") version "1.3.3"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("org.graalvm.buildtools.native") version "1.1.3"
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"