Nightly dependency update: OpenTelemetry 2.28.1/1.57.0 (#1378)

Automated update of OpenTelemetry dependencies.

**Build Status:** ❌
[failure](https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/26268891482)

**Updated versions:**
- [OpenTelemetry Java
Instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.28.1):
2.28.1
- [OpenTelemetry Java
Contrib](https://github.com/open-telemetry/opentelemetry-java-contrib/releases/tag/v1.57.0):
1.57.0

**Upstream releases with breaking changes:**
Note: the mechanism to detect upstream breaking changes is not perfect.
Be sure to check all new releases and understand if any additional
changes need to be addressed.

**opentelemetry-java-instrumentation:**
- [Version
2.28.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.28.0)
- [Version
2.27.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.27.0)

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: victor wang <viw@amazon.com>

Author: 3 people

.github/patches/opentelemetry-java-contrib.patch

@@ -712,10 +712,10 @@ index 74967704..d08094f7 100644
 --- a/version.gradle.kts
 +++ b/version.gradle.kts
 @@ -1,5 +1,5 @@
--val stableVersion = "1.54.0"
--val alphaVersion = "1.54.0-alpha"
-+val stableVersion = "1.54.0-adot1"
-+val alphaVersion = "1.54.0-alpha-adot1"
+-val stableVersion = "1.57.0"
+-val alphaVersion = "1.57.0-alpha"
++val stableVersion = "1.57.0-adot1"
++val alphaVersion = "1.57.0-alpha-adot1"
  val tagVersion by extra { "v$stableVersion" }
 
  allprojects {

.github/patches/versions

@@ -1,2 +1,2 @@
-OTEL_JAVA_INSTRUMENTATION_VERSION=v2.26.1
-OTEL_JAVA_CONTRIB_VERSION=v1.54.0
+OTEL_JAVA_INSTRUMENTATION_VERSION=v2.28.1
+OTEL_JAVA_CONTRIB_VERSION=v1.57.0

dependencyManagement/build.gradle.kts

@@ -27,8 +27,8 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
 // This is the version of the upstream instrumentation BOM
-val otelVersion = "2.26.1"
-val otelSnapshotVersion = "2.27.0"
+val otelVersion = "2.28.1"
+val otelSnapshotVersion = "2.29.0"
 val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
 val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
 // All versions below are only used in testing and do not affect the released artifact.
@@ -75,8 +75,8 @@ val dependencyLists = listOf(
   "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.4",
   "com.squareup.okhttp3:okhttp:4.12.0",
-  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.54.0-adot1",
-  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.54.0-alpha",
+  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.57.0-adot1",
+  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.57.0-alpha",
   "io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
   "io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion",
   "io.opentelemetry:opentelemetry-extension-aws:1.20.1",

lambda-layer/patches/aws-otel-java-instrumentation.patch

@@ -6,8 +6,8 @@ index 6ca4ff5..97e211a 100644
  val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
  // This is the version of the upstream instrumentation BOM
--val otelVersion = "2.26.1"
-+val otelVersion = "2.26.1-adot-lambda1"
- val otelSnapshotVersion = "2.27.0"
+-val otelVersion = "2.28.1"
++val otelVersion = "2.28.1-adot-lambda1"
+ val otelSnapshotVersion = "2.29.0"
  val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
  val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"

lambda-layer/patches/opentelemetry-java-instrumentation.patch

@@ -108,7 +108,16 @@ index 9341bf6f79..f719c1ea93 100644
  import java.util.Map;
  import javax.annotation.Nullable;
 
-@@ -47,8 +46,8 @@ public class AwsLambdaFunctionInstrumenter {
+@@ -22,8 +21,6 @@ import javax.annotation.Nullable;
+  */
+ public class AwsLambdaFunctionInstrumenter {
+
+-  private static final MapGetter mapGetter = new MapGetter();
+-
+   private final OpenTelemetry openTelemetry;
+   final Instrumenter<AwsLambdaRequest, Object> instrumenter;
+
+@@ -49,8 +46,8 @@ public class AwsLambdaFunctionInstrumenter {
      instrumenter.end(context, input, response, error);
    }
 
@@ -119,36 +128,39 @@ index 9341bf6f79..f719c1ea93 100644
      // Look in both the http headers and the custom client context
      Map<String, String> headers = input.getHeaders();
      if (input.getAwsContext() != null && input.getAwsContext().getClientContext() != null) {
-@@ -59,23 +58,15 @@ public class AwsLambdaFunctionInstrumenter {
+@@ -61,26 +58,15 @@ public class AwsLambdaFunctionInstrumenter {
        }
      }
 
--    return openTelemetry
--        .getPropagators()
--        .getTextMapPropagator()
--        .extract(Context.root(), headers, MapGetter.INSTANCE);
 +    return ParentContextExtractor.extract(headers, this, lambdaContext);
++  }
++
++  public Context extract(Map<String, String> headers, TextMapGetter<Map<String, String>> getter) {
++    ContextPropagationDebug.debugContextLeakIfEnabled();
++
+     return openTelemetry
+         .getPropagators()
+         .getTextMapPropagator()
+-        .extract(Context.root(), headers, mapGetter);
++        .extract(Context.root(), headers, getter);
    }
-
--  private enum MapGetter implements TextMapGetter<Map<String, String>> {
--    INSTANCE;
+-
+-  private static class MapGetter implements TextMapGetter<Map<String, String>> {
 -
 -    @Override
 -    public Iterable<String> keys(Map<String, String> map) {
 -      return map.keySet();
 -    }
-+  public Context extract(Map<String, String> headers, TextMapGetter<Map<String, String>> getter) {
-+    ContextPropagationDebug.debugContextLeakIfEnabled();
-
+-
 -    @Override
--    public String get(Map<String, String> map, String s) {
+-    @Nullable
+-    public String get(@Nullable Map<String, String> map, String s) {
+-      if (map == null) {
+-        return null;
+-      }
 -      return map.get(s.toLowerCase(Locale.ROOT));
 -    }
-+    return openTelemetry
-+        .getPropagators()
-+        .getTextMapPropagator()
-+        .extract(Context.root(), headers, getter);
-   }
+-  }
  }
 diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractor.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractor.java
 new file mode 100644
@@ -678,10 +690,10 @@ index a46c2d24de..71a2264042 100644
 --- a/version.gradle.kts
 +++ b/version.gradle.kts
 @@ -1,5 +1,5 @@
--val stableVersion = "2.26.1"
--val alphaVersion = "2.26.1-alpha"
-+val stableVersion = "2.26.1-adot-lambda1"
-+val alphaVersion = "2.26.1-adot-lambda1-alpha"
+-val stableVersion = "2.28.1"
+-val alphaVersion = "2.28.1-alpha"
++val stableVersion = "2.28.1-adot-lambda1"
++val alphaVersion = "2.28.1-adot-lambda1-alpha"
 
  allprojects {
    if (findProperty("otel.stable") != "true") {

scripts/update_dependencies.py

@@ -16,14 +16,13 @@ def update_file_dependencies(file_path, otel_instrumentation_version, otel_contr
 
         # Update otelVersion variable
         otel_version_pattern = r'val otelVersion = "[^"]*"'
-        otel_version_with_suffix = f"{otel_instrumentation_version}-adot1"
-        otel_version_replacement = f'val otelVersion = "{otel_version_with_suffix}"'
+        otel_version_replacement = f'val otelVersion = "{otel_instrumentation_version}"'
         if re.search(otel_version_pattern, content):
             new_content = re.sub(otel_version_pattern, otel_version_replacement, content)
             if new_content != content:
                 content = new_content
                 updated = True
-                print(f"Updated otelVersion to {otel_version_with_suffix}")
+                print(f"Updated otelVersion to {otel_instrumentation_version}")
 
         # Update otelSnapshotVersion (typically next minor version)
         version_parts = otel_instrumentation_version.split(".")
@@ -112,7 +111,7 @@ def main():
             any_updated = True
 
     if any_updated:
-        print(f"Dependencies updated to Instrumentation {otel_instrumentation_version}-adot1 / Contrib {otel_contrib_version} (with appropriate suffixes)")
+        print(f"Dependencies updated to Instrumentation {otel_instrumentation_version} / Contrib {otel_contrib_version} (with appropriate suffixes)")
     else:
         print("No OpenTelemetry dependencies found to update")