Merge branch 'main' into fbc-create-resource-from-model

Author: robsunday

CHANGELOG.md

@@ -2,6 +2,62 @@
 
 ## Unreleased
 
+## Version 1.52.0 (2025-07-11)
+
+### API
+
+#### Common
+
+* Promote `ComponentLoader` to new `opentelemetry-common` artifact,
+  standardize SPI loading
+  ([#7446](https://github.com/open-telemetry/opentelemetry-java/pull/7446))
+
+#### Context
+
+* LazyStorage passes its ClassLoader when loading ContextStorageProvider SPI
+  ([#7424](https://github.com/open-telemetry/opentelemetry-java/pull/7424))
+
+#### Incubator
+
+* Add context and severity params to ExtendedLogger#isEnabled
+  ([#7268](https://github.com/open-telemetry/opentelemetry-java/pull/7268))
+* Add new convenience methods for converting DeclarativeConfigProperties to config model
+  ([#7453](https://github.com/open-telemetry/opentelemetry-java/pull/7453))
+
+### SDK
+
+* Add custom stacktrace renderer which is length limit aware
+  ([#7281](https://github.com/open-telemetry/opentelemetry-java/pull/7281))
+
+#### Metrics
+
+* Propagate flush to PeriodicMetricReader's metricExporter.
+  ([#7410](https://github.com/open-telemetry/opentelemetry-java/pull/7410))
+
+#### Exporters
+
+* OTLP - JdkHttpSender: ensure proper closure of HttpClient in shutdown method
+  ([#7390](https://github.com/open-telemetry/opentelemetry-java/pull/7390))
+* OTLP: profile exporters fix and test improvements
+  ([#7442](https://github.com/open-telemetry/opentelemetry-java/pull/7442))
+* OTLP: Loading Compressor SPI via ComponentLoader configured through setComponentLoader
+  ([#7428](https://github.com/open-telemetry/opentelemetry-java/pull/7428))
+* Prometheus: add scope schema URL and attributes
+  ([#7356](https://github.com/open-telemetry/opentelemetry-java/pull/7356))
+* Prometheus: extend prometheus declarative config support to include without_scope_info,
+  with_resource_constant_labels
+  ([#6840](https://github.com/open-telemetry/opentelemetry-java/pull/6840))
+
+#### Extensions
+
+* Autoconfigure: fix race condition of `GlobalOpenTelemetry` initialization with
+  `AutoConfiguredOpenTelemetrySdkBuilder`
+  ([#7365](https://github.com/open-telemetry/opentelemetry-java/pull/7365))
+* Declarative config: update to declarative config 1.0-rc.1
+  ([#7436](https://github.com/open-telemetry/opentelemetry-java/pull/7436))
+* Declarative config: resolve environment variable substitution for mixed quotes
+  ([#7433](https://github.com/open-telemetry/opentelemetry-java/pull/7433))
+
 ## Version 1.51.0 (2025-06-06)
 
 ### API

README.md

@@ -28,7 +28,7 @@ class SdkDesignTest {
    * Ensures that all SDK methods that: - are defined in classes that extend or implement API model
    * and are public (to exclude protected builders) - are public (avoids issues with protected
    * methods returning classes unavailable to test's CL) - override or implement parent method
-   * return only API, Context or generic Java type.
+   * return only API, Context, Common, or generic Java type.
    */
   @Test
   void sdkImplementationOfApiClassesShouldReturnApiTypeOnly() {
@@ -45,7 +45,11 @@ void sdkImplementationOfApiClassesShouldReturnApiTypeOnly() {
             .and(implementOrOverride())
             .should()
             .haveRawReturnType(
-                inPackage("io.opentelemetry.api..", "io.opentelemetry.context..", "java.."))
+                inPackage(
+                    "io.opentelemetry.api..",
+                    "io.opentelemetry.context..",
+                    "io.opentelemetry.common..",
+                    "java.."))
             .orShould()
             .haveRawReturnType("void");
 

all/src/test/java/io/opentelemetry/all/SdkDesignTest.java

@@ -122,6 +122,8 @@ public static void set(OpenTelemetry openTelemetry) {
    *
    * <p>This method calls the given {@code supplier} and calls {@link #set(OpenTelemetry)}, all
    * while holding the {@link GlobalOpenTelemetry} mutex.
+   *
+   * @since 1.52.0
    */
   public static void set(Supplier<OpenTelemetry> supplier) {
     synchronized (mutex) {

api/all/src/main/java/io/opentelemetry/api/GlobalOpenTelemetry.java

@@ -12,6 +12,9 @@ otelJava.moduleName.set("io.opentelemetry.api.incubator")
 dependencies {
   api(project(":api:all"))
 
+  // Supports optional InstrumentationConfigUtil#convertToModel
+  compileOnly("com.fasterxml.jackson.core:jackson-databind")
+
   annotationProcessor("com.google.auto.value:auto-value")
 
   // To use parsed config file as input for InstrumentationConfigUtilTest
@@ -24,3 +27,16 @@ dependencies {
 
   testImplementation("com.google.guava:guava")
 }
+
+testing {
+  suites {
+    register<JvmTestSuite>("testConvertToModel") {
+      dependencies {
+        implementation("com.fasterxml.jackson.core:jackson-databind")
+        implementation(project(":sdk-extensions:incubator"))
+        implementation(project(":sdk-extensions:autoconfigure"))
+        implementation("com.google.guava:guava")
+      }
+    }
+  }
+}

api/incubator/build.gradle.kts

@@ -7,7 +7,9 @@
 
 import static io.opentelemetry.api.internal.ConfigUtil.defaultIfNull;
 
+import io.opentelemetry.common.ComponentLoader;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
 
@@ -36,6 +38,11 @@ static DeclarativeConfigProperties empty() {
     return EmptyDeclarativeConfigProperties.getInstance();
   }
 
+  /** Return a map representation of the {@code declarativeConfigProperties}. */
+  static Map<String, Object> toMap(DeclarativeConfigProperties declarativeConfigProperties) {
+    return DeclarativeConfigPropertyUtil.toMap(declarativeConfigProperties);
+  }
+
   /**
    * Returns a {@link String} configuration property.
    *
@@ -222,4 +229,7 @@ default List<DeclarativeConfigProperties> getStructuredList(
    * @return the configuration property keys
    */
   Set<String> getPropertyKeys();
+
+  /** Return a {@link ComponentLoader} that should be used to load SPIs. */
+  ComponentLoader getComponentLoader();
 }

api/incubator/src/main/java/io/opentelemetry/api/incubator/config/DeclarativeConfigProperties.java

@@ -0,0 +1,126 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.api.incubator.config;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiFunction;
+import javax.annotation.Nullable;
+
+final class DeclarativeConfigPropertyUtil {
+
+  private DeclarativeConfigPropertyUtil() {}
+
+  private static final List<BiFunction<String, DeclarativeConfigProperties, Object>>
+      valueResolvers =
+          Arrays.asList(
+              DeclarativeConfigPropertyUtil::getString,
+              DeclarativeConfigPropertyUtil::getBoolean,
+              DeclarativeConfigPropertyUtil::getLong,
+              DeclarativeConfigPropertyUtil::getDouble,
+              DeclarativeConfigPropertyUtil::getStringList,
+              DeclarativeConfigPropertyUtil::getBooleanList,
+              DeclarativeConfigPropertyUtil::getLongList,
+              DeclarativeConfigPropertyUtil::getDoubleList,
+              DeclarativeConfigPropertyUtil::getStringList,
+              DeclarativeConfigPropertyUtil::getStructuredList,
+              DeclarativeConfigPropertyUtil::getStructured);
+
+  static Map<String, Object> toMap(DeclarativeConfigProperties declarativeConfigProperties) {
+    Set<String> propertyKeys = declarativeConfigProperties.getPropertyKeys();
+    Map<String, Object> result = new HashMap<>(propertyKeys.size());
+    for (String key : declarativeConfigProperties.getPropertyKeys()) {
+      result.put(key, resolveValue(key, declarativeConfigProperties));
+    }
+    return result;
+  }
+
+  @Nullable
+  private static Object resolveValue(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    for (int i = 0; i < valueResolvers.size(); i++) {
+      try {
+        Object value = valueResolvers.get(i).apply(key, declarativeConfigProperties);
+        if (value != null) {
+          return value;
+        }
+      } catch (DeclarativeConfigException e) {
+        // Ignore and continue
+      }
+    }
+    return null;
+  }
+
+  @Nullable
+  private static Object getString(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return declarativeConfigProperties.getString(key);
+  }
+
+  @Nullable
+  private static Object getBoolean(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return declarativeConfigProperties.getBoolean(key);
+  }
+
+  @Nullable
+  private static Object getLong(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return declarativeConfigProperties.getLong(key);
+  }
+
+  @Nullable
+  private static Object getDouble(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return declarativeConfigProperties.getDouble(key);
+  }
+
+  @Nullable
+  private static Object getStringList(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return declarativeConfigProperties.getScalarList(key, String.class);
+  }
+
+  @Nullable
+  private static Object getBooleanList(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return declarativeConfigProperties.getScalarList(key, Boolean.class);
+  }
+
+  @Nullable
+  private static Object getLongList(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return declarativeConfigProperties.getScalarList(key, Long.class);
+  }
+
+  @Nullable
+  private static Object getDoubleList(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return declarativeConfigProperties.getScalarList(key, Double.class);
+  }
+
+  @Nullable
+  private static Object getStructuredList(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return Optional.ofNullable(declarativeConfigProperties.getStructuredList(key))
+        .map(list -> list.stream().map(DeclarativeConfigPropertyUtil::toMap).collect(toList()))
+        .orElse(null);
+  }
+
+  @Nullable
+  private static Object getStructured(
+      String key, DeclarativeConfigProperties declarativeConfigProperties) {
+    return Optional.ofNullable(declarativeConfigProperties.getStructured(key))
+        .map(DeclarativeConfigPropertyUtil::toMap)
+        .orElse(null);
+  }
+}

api/incubator/src/main/java/io/opentelemetry/api/incubator/config/DeclarativeConfigPropertyUtil.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.api.incubator.config;
 
+import io.opentelemetry.common.ComponentLoader;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -15,6 +16,8 @@ final class EmptyDeclarativeConfigProperties implements DeclarativeConfigPropert
 
   private static final EmptyDeclarativeConfigProperties INSTANCE =
       new EmptyDeclarativeConfigProperties();
+  private static final ComponentLoader COMPONENT_LOADER =
+      ComponentLoader.forClassLoader(EmptyDeclarativeConfigProperties.class.getClassLoader());
 
   private EmptyDeclarativeConfigProperties() {}
 
@@ -74,4 +77,9 @@ public List<DeclarativeConfigProperties> getStructuredList(String name) {
   public Set<String> getPropertyKeys() {
     return Collections.emptySet();
   }
+
+  @Override
+  public ComponentLoader getComponentLoader() {
+    return COMPONENT_LOADER;
+  }
 }

api/incubator/src/main/java/io/opentelemetry/api/incubator/config/EmptyDeclarativeConfigProperties.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.api.incubator.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -148,4 +149,49 @@ public static <T> T getOrNull(
   }
 
   private InstrumentationConfigUtil() {}
+
+  /**
+   * Return {@code .instrumentation.java.<instrumentationName>}, after converting it to the {@code
+   * modelType} using the {@code objectMapper}. If no configuration exists for the {@code
+   * instrumentationName}, returns {@code null}.
+   *
+   * <p>This method is a convenience method for a common instrumentation library workflow:
+   *
+   * <ul>
+   *   <li>During initialization, an instrumentation library is given an {@link ConfigProvider} and
+   *       must initialize according to the relevant config
+   *   <li>It checks if the user has provided configuration for it, and if so...
+   *   <li>It converts the configuration to an in-memory model representing all of its relevant
+   *       properties
+   *   <li>It initializes using the strongly typed in-memory model
+   * </ul>
+   *
+   * <p>Conversion is done using {@link ObjectMapper#convertValue(Object, Class)} from {@code
+   * com.fasterxml.jackson.databind}, and assumes the {@code modelType} is a POJO written /
+   * annotated to support jackson databinding.
+   *
+   * <p>NOTE: callers MUST add their own dependency on {@code
+   * com.fasterxml.jackson.core:jackson-databind}. This module's dependency is {@code compileOnly}
+   * since jackson is a large dependency that many users will not require. It's very possible to
+   * convert between {@link DeclarativeConfigProperties} (or a map representation from {@link
+   * DeclarativeConfigProperties#toMap(DeclarativeConfigProperties)}) and a target model type
+   * without jackson. This method is provided as an optional convenience method.
+   *
+   * @throws IllegalArgumentException if conversion fails. See {@link
+   *     ObjectMapper#convertValue(Object, Class)} for details.
+   */
+  @Nullable
+  public static <T> T getInstrumentationConfigModel(
+      ConfigProvider configProvider,
+      String instrumentationName,
+      ObjectMapper objectMapper,
+      Class<T> modelType) {
+    DeclarativeConfigProperties properties =
+        javaInstrumentationConfig(configProvider, instrumentationName);
+    if (properties == null) {
+      return null;
+    }
+    Map<String, Object> configPropertiesMap = DeclarativeConfigProperties.toMap(properties);
+    return objectMapper.convertValue(configPropertiesMap, modelType);
+  }
 }

api/incubator/src/main/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtil.java

@@ -27,6 +27,11 @@ static Logger getNoop() {
     return INSTANCE;
   }
 
+  @Override
+  public boolean isEnabled(Severity severity, Context context) {
+    return false;
+  }
+
   @Override
   public ExtendedLogRecordBuilder logRecordBuilder() {
     return NOOP_LOG_RECORD_BUILDER;