Update opentelemetry-lambda sub module (#906)

* Initial commit to update sub module

* Update manager and collector.go patches

* Modify java patch

adot/collector/VERSION

@@ -1 +1 @@
-v0.35.0
+v0.39.0

adot/collector/lambdacomponents/default.go

@@ -18,8 +18,6 @@ package lambdacomponents
 //github.com/aws-observability/aws-otel-lambda/adot/collector/lambdacomponents
 
 import (
-	"log"
-
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter"
@@ -29,7 +27,6 @@ import (
 	"go.opentelemetry.io/collector/exporter/otlpexporter"
 	"go.opentelemetry.io/collector/exporter/otlphttpexporter"
 	"go.opentelemetry.io/collector/extension"
-	"go.opentelemetry.io/collector/featuregate"
 	"go.opentelemetry.io/collector/otelcol"
 	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/otlpreceiver"
@@ -76,13 +73,5 @@ func Components() (
 		Exporters:  exporters,
 	}
 
-	// TODO: remove after ADOT Collector v0.30.0 is released
-	if err := featuregate.GlobalRegistry().Set("pkg.translator.prometheus.NormalizeName", false); err != nil {
-		return otelcol.Factories{}, err
-	}
-	log.Printf("attn: users of the prometheusremotewrite exporter please refer to " +
-		"https://github.com/aws-observability/aws-otel-collector/issues/2043 in regards to an ADOT Collector v0.31.0 " +
-		"breaking change")
-
 	return factories, errs
 }

adot/collector/lambdacomponents/default_test.go

@@ -18,6 +18,7 @@ package lambdacomponents
 //github.com/aws-observability/aws-otel-lambda/adot/collector/lambdacomponents
 
 import (
+	"go.opentelemetry.io/collector/component"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -35,22 +36,22 @@ func TestComponents(t *testing.T) {
 	exporters := factories.Exporters
 	assert.Len(t, exporters, exportersCount)
 	// aws exporters
-	assert.NotNil(t, exporters["awsxray"])
-	assert.NotNil(t, exporters["awsemf"])
+	assert.NotNil(t, exporters[component.MustNewType("awsxray")])
+	assert.NotNil(t, exporters[component.MustNewType("awsemf")])
 	// core exporters
-	assert.NotNil(t, exporters["logging"])
-	assert.NotNil(t, exporters["otlp"])
-	assert.NotNil(t, exporters["otlphttp"])
+	assert.NotNil(t, exporters[component.MustNewType("logging")])
+	assert.NotNil(t, exporters[component.MustNewType("otlp")])
+	assert.NotNil(t, exporters[component.MustNewType("otlphttp")])
 	// other exporters
-	assert.NotNil(t, exporters["prometheusremotewrite"])
+	assert.NotNil(t, exporters[component.MustNewType("prometheusremotewrite")])
 
 	receivers := factories.Receivers
 	assert.Len(t, receivers, receiversCount)
 	// core receivers
-	assert.NotNil(t, receivers["otlp"])
+	assert.NotNil(t, receivers[component.MustNewType("otlp")])
 
 	extensions := factories.Extensions
 	assert.Len(t, extensions, extensionsCount)
 	// aws extensions
-	assert.NotNil(t, extensions["sigv4auth"])
+	assert.NotNil(t, extensions[component.MustNewType("sigv4auth")])
 }

collector.patch

@@ -1,5 +1,5 @@
 diff --git a/collector/internal/collector/collector.go b/collector/internal/collector/collector.go
-index 7cdea69..553e649 100644
+index 35aaa18..46af9b7 100644
 --- a/collector/internal/collector/collector.go
 +++ b/collector/internal/collector/collector.go
 @@ -26,6 +26,7 @@ import (
@@ -10,23 +10,24 @@ index 7cdea69..553e649 100644
  	"go.opentelemetry.io/collector/confmap/provider/yamlprovider"
  	"go.opentelemetry.io/collector/otelcol"
  	"go.uber.org/zap"
-@@ -57,7 +58,14 @@ func getConfig(logger *zap.Logger) string {
-
+@@ -59,7 +60,15 @@ func getConfig(logger *zap.Logger) string {
  func NewCollector(logger *zap.Logger, factories otelcol.Factories, version string) *Collector {
  	l := logger.Named("NewCollector")
--	providers := []confmap.Provider{fileprovider.New(), envprovider.New(), yamlprovider.New(), httpprovider.New(), s3provider.New()}
+ 	providerSettings := confmap.ProviderSettings{Logger: l}
+-	providers := []confmap.Provider{fileprovider.NewWithSettings(providerSettings), envprovider.NewWithSettings(providerSettings), yamlprovider.NewWithSettings(providerSettings), httpprovider.NewWithSettings(providerSettings), s3provider.New()}
 +	providers := []confmap.Provider{
-+		fileprovider.New(),
-+		envprovider.New(),
-+		yamlprovider.New(),
-+		httpprovider.New(),
++		fileprovider.NewWithSettings(providerSettings),
++		envprovider.NewWithSettings(providerSettings),
++		yamlprovider.NewWithSettings(providerSettings),
++		httpprovider.NewWithSettings(providerSettings),
++		httpsprovider.NewWithSettings(providerSettings),
 +		s3provider.New(),
-+		httpsprovider.New(),
 +	}
++
  	mapProvider := make(map[string]confmap.Provider, len(providers))
-
+ 
  	for _, provider := range providers {
-@@ -89,8 +97,8 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
+@@ -93,8 +102,8 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
  func (c *Collector) Start(ctx context.Context) error {
  	params := otelcol.CollectorSettings{
  		BuildInfo: component.BuildInfo{

manager.patch

@@ -1,8 +1,24 @@
 diff --git a/collector/internal/lifecycle/manager.go b/collector/internal/lifecycle/manager.go
-index 5ec1b6a..d7bf7d2 100644
+index 68f6939..2f8ab1e 100644
 --- a/collector/internal/lifecycle/manager.go
 +++ b/collector/internal/lifecycle/manager.go
-@@ -90,7 +90,7 @@
+@@ -17,13 +17,14 @@ package lifecycle
+ import (
+ 	"context"
+ 	"fmt"
+-	"github.com/open-telemetry/opentelemetry-lambda/collector/lambdalifecycle"
+ 	"os"
+ 	"os/signal"
+ 	"path/filepath"
+ 	"sync"
+ 	"syscall"
+
++	"github.com/open-telemetry/opentelemetry-lambda/collector/lambdalifecycle"
++
+ 	"go.uber.org/multierr"
+ 	"go.uber.org/zap"
+
+@@ -92,7 +93,7 @@ func NewManager(ctx context.Context, logger *zap.Logger, version string) (contex
  		}
  	}()
 

patch-upstream.sh

@@ -31,10 +31,7 @@ if [ -f $PATCH_OTEL_VERSION ]; then
     patch -p2 < $PATCH_OTEL_VERSION;
 fi
 
-
-
-# patch collector startup to remove HTTP and S3 confmap providers
-# and set ADOT-specific BuildInfo
+# patch collector startup to add httpsprovider
 patch -p2 < ../../collector.patch
 
 # patch manager.go to remove lambdacomponents attribute

patches/opentelemetry-lambda_java.patch

@@ -12,24 +12,27 @@ index 3e862e7..d3941ac 100644
          }
 
 diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts
-index 2d5f860..cceb485 100644
+index f1241db..6bca2dc 100644
 --- a/java/dependencyManagement/build.gradle.kts
 +++ b/java/dependencyManagement/build.gradle.kts
 @@ -9,7 +9,7 @@ plugins {
  data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
  val DEPENDENCY_BOMS = listOf(
--    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.0.0-alpha",
+-    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.3.0-alpha",
 +    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-adot-lambda1-alpha",
-     "org.apache.logging.log4j:log4j-bom:2.22.1",
-     "software.amazon.awssdk:bom:2.24.2"
+     "org.apache.logging.log4j:log4j-bom:2.23.1",
+     "software.amazon.awssdk:bom:2.25.35"
  )
-@@ -18,7 +18,7 @@ val DEPENDENCIES = listOf(
+@@ -18,9 +18,9 @@ val DEPENDENCIES = listOf(
      "com.amazonaws:aws-lambda-java-core:1.2.3",
-     "com.amazonaws:aws-lambda-java-events:3.11.4",
+     "com.amazonaws:aws-lambda-java-events:3.11.5",
      "com.squareup.okhttp3:okhttp:4.12.0",
--    "io.opentelemetry.javaagent:opentelemetry-javaagent:2.0.0"
-+    "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0-adot-lambda1"
+-    "io.opentelemetry.javaagent:opentelemetry-javaagent:2.3.0",
++    "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0-adot-lambda1",
+     "io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
+-    "io.opentelemetry.contrib:opentelemetry-aws-resources:1.35.0-alpha",
++    "io.opentelemetry.contrib:opentelemetry-aws-resources:1.32.0-alpha",
  )
 
  javaPlatform {