[chore] Update opentelemetry lambda submodules (#1023)

* Update opentelemetry sub module * Replace Logging exporter with debug, bump collector v0.115.0 * Add collector version patch to v0.115.0 and update patches * update nodejs dependencies * Update lambda java patch * keep node version as previous * Update patch to exclude lambda components * use npm run build to build layer, fix lambda java patch
aws-observability · Dec 30, 2024 · 4872c8c · 4872c8c
1 parent 884b7f1
commit 4872c8c
Show file tree

Hide file tree

Showing 15 changed files with 2,164 additions and 1,304 deletions.
diff --git a/OTEL_Version.patch b/OTEL_Version.patch
diff --git a/adot/collector/VERSION b/adot/collector/VERSION
@@ -1 +1 @@
-v0.40.0
+v0.42.0
diff --git a/adot/collector/config.yaml b/adot/collector/config.yaml
@@ -7,7 +7,7 @@ receivers:
         endpoint: "localhost:4318"
 
 exporters:
-  logging:
+  debug:
   awsxray:
 
 service:
@@ -17,7 +17,7 @@ service:
       exporters: [awsxray]
     metrics:
       receivers: [otlp]
-      exporters: [logging]
+      exporters: [debug]
   telemetry:
     metrics:
       address: localhost:8888
diff --git a/adot/collector/lambdacomponents/default.go b/adot/collector/lambdacomponents/default.go
@@ -23,7 +23,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension"
 	"go.opentelemetry.io/collector/exporter"
-	"go.opentelemetry.io/collector/exporter/loggingexporter"
+	"go.opentelemetry.io/collector/exporter/debugexporter"
 	"go.opentelemetry.io/collector/exporter/otlpexporter"
 	"go.opentelemetry.io/collector/exporter/otlphttpexporter"
 	"go.opentelemetry.io/collector/extension"
@@ -59,7 +59,7 @@ func Components() (
 		awsxrayexporter.NewFactory(),
 		awsemfexporter.NewFactory(),
 		prometheusremotewriteexporter.NewFactory(),
-		loggingexporter.NewFactory(),
+		debugexporter.NewFactory(),
 		otlpexporter.NewFactory(),
 		otlphttpexporter.NewFactory(),
 	)

diff --git a/adot/collector/lambdacomponents/default_test.go b/adot/collector/lambdacomponents/default_test.go
@@ -39,7 +39,7 @@ func TestComponents(t *testing.T) {
 	assert.NotNil(t, exporters[component.MustNewType("awsxray")])
 	assert.NotNil(t, exporters[component.MustNewType("awsemf")])
 	// core exporters
-	assert.NotNil(t, exporters[component.MustNewType("logging")])
+	assert.NotNil(t, exporters[component.MustNewType("debug")])
 	assert.NotNil(t, exporters[component.MustNewType("otlp")])
 	assert.NotNil(t, exporters[component.MustNewType("otlphttp")])
 	// other exporters

diff --git a/adot/collector/lambdacomponents/go.mod b/adot/collector/lambdacomponents/go.mod
diff --git a/adot/collector/lambdacomponents/go.sum b/adot/collector/lambdacomponents/go.sum
diff --git a/collector.patch b/collector.patch
@@ -1,25 +1,25 @@
 diff --git a/collector/internal/collector/collector.go b/collector/internal/collector/collector.go
-index 4dcbde3..722e304 100644
+index 5f9ea03..500a430 100644
 --- a/collector/internal/collector/collector.go
 +++ b/collector/internal/collector/collector.go
-@@ -17,6 +17,7 @@ package collector
- import (
- 	"context"
- 	"fmt"
-+	"go.opentelemetry.io/collector/confmap/provider/httpsprovider"
+@@ -20,7 +20,6 @@ import (
  	"os"
 
  	"github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider"
-@@ -60,7 +61,7 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
+-	"github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider"
+ 	"go.opentelemetry.io/collector/component"
+ 	"go.opentelemetry.io/collector/confmap"
+ 	"go.opentelemetry.io/collector/confmap/provider/envprovider"
+@@ -74,7 +73,7 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
  	cfgSet := otelcol.ConfigProviderSettings{
  		ResolverSettings: confmap.ResolverSettings{
  			URIs:              []string{getConfig(l)},
--			ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory(), envprovider.NewFactory(), yamlprovider.NewFactory(), httpprovider.NewFactory(), s3provider.NewFactory()},
-+			ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory(), envprovider.NewFactory(), yamlprovider.NewFactory(), httpprovider.NewFactory(), httpsprovider.NewFactory(), s3provider.NewFactory()},
+-			ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory(), envprovider.NewFactory(), yamlprovider.NewFactory(), httpsprovider.NewFactory(), httpprovider.NewFactory(), s3provider.NewFactory(), secretsmanagerprovider.NewFactory()},
++			ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory(), envprovider.NewFactory(), yamlprovider.NewFactory(), httpsprovider.NewFactory(), httpprovider.NewFactory(), s3provider.NewFactory()},
  			ConverterFactories: []confmap.ConverterFactory{
- 				expandconverter.NewFactory(),
  				confmap.NewConverterFactory(func(set confmap.ConverterSettings) confmap.Converter {
-@@ -82,8 +83,8 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
+ 					return disablequeuedretryconverter.New()
+@@ -95,8 +94,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{

diff --git a/java/build.sh b/java/build.sh
@@ -65,12 +65,12 @@ popd || exit
 
 # Combine Java Wrapper build and ADOT Collector
 pushd ./layer-wrapper/build/distributions || exit
-unzip -qo opentelemetry-java-wrapper.zip
-rm opentelemetry-java-wrapper.zip
+unzip -qo opentelemetry-javawrapper-layer.zip
+rm opentelemetry-javawrapper-layer.zip
 mv otel-handler otel-handler-upstream
 mv otel-stream-handler otel-stream-handler-upstream
 mv otel-proxy-handler otel-proxy-handler-upstream
 cp "$SOURCEDIR"/scripts/* .
 unzip -qo ${SOURCEDIR}/../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-$1.zip
-zip -qr opentelemetry-java-wrapper.zip *
+zip -qr opentelemetry-javawrapper-layer.zip *
 popd || exit
diff --git a/java/integration-tests/aws-sdk/wrapper/main.tf b/java/integration-tests/aws-sdk/wrapper/main.tf
@@ -4,10 +4,10 @@ locals {
 
 resource "aws_lambda_layer_version" "sdk_layer" {
   layer_name          = var.sdk_layer_name
-  filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
+  filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip"
   compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
-  source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
+  source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip")
 }
 
 resource "aws_lambda_layer_version" "collector_layer" {

diff --git a/java/integration-tests/okhttp/wrapper/main.tf b/java/integration-tests/okhttp/wrapper/main.tf
@@ -4,10 +4,10 @@ locals {
 
 resource "aws_lambda_layer_version" "sdk_layer" {
   layer_name          = var.sdk_layer_name
-  filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
+  filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip"
   compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
-  source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
+  source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip")
 }
 
 resource "aws_lambda_layer_version" "collector_layer" {

diff --git a/nodejs/build.sh b/nodejs/build.sh
@@ -16,7 +16,7 @@ cd wrapper-adot || exit
 npm install || exit
 
 cd ../../opentelemetry-lambda/nodejs || exit
-npm install || exit
+npm install && npm run build|| exit
 
 mv ./packages/layer/build/workspace/otel-handler ./packages/layer/build/workspace/otel-handler-upstream
 cp "$SOURCEDIR"/scripts/otel-handler ./packages/layer/build/workspace/otel-handler

diff --git a/nodejs/wrapper-adot/package.json b/nodejs/wrapper-adot/package.json
@@ -25,7 +25,7 @@
     "node": ">=16.0.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.7.0",
+    "@opentelemetry/api": "^1.9.0",
     "@types/node": "20.12.7",
     "@typescript-eslint/eslint-plugin": "6.14.0",
     "@typescript-eslint/parser": "6.19.0",
@@ -37,11 +37,11 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.18.1",
-    "@opentelemetry/id-generator-aws-xray": "^1.2.1",
-    "@opentelemetry/sdk-trace-node": "^1.18.1",
-    "@opentelemetry/propagator-aws-xray": "^1.3.1",
-    "@opentelemetry/propagator-b3": "^1.18.1",
-    "@opentelemetry/sdk-trace-base": "^1.18.1"
+    "@opentelemetry/core": "^1.30.0",
+    "@opentelemetry/id-generator-aws-xray": "^1.2.2",
+    "@opentelemetry/sdk-trace-node": "^1.30.0",
+    "@opentelemetry/propagator-aws-xray": "^1.26.0",
+    "@opentelemetry/propagator-b3": "^1.30.0",
+    "@opentelemetry/sdk-trace-base": "^1.30.0"
   }
 }
diff --git a/opentelemetry-lambda b/opentelemetry-lambda