Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] Update opentelemetry lambda submodules #1023

Merged
merged 8 commits into from
Dec 30, 2024
Merged

[chore] Update opentelemetry lambda submodules #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a89133
Update opentelemetry sub module
vasireddy99 Dec 27, 2024
03fc89f
Replace Logging exporter with debug, bump collector v0.115.0
vasireddy99 Dec 27, 2024
00021f1
Add collector version patch to v0.115.0 and update patches
vasireddy99 Dec 27, 2024
246fef9
update nodejs dependencies
vasireddy99 Dec 27, 2024
17b0f88
Update lambda java patch
vasireddy99 Dec 27, 2024
8f91573
keep node version as previous
vasireddy99 Dec 27, 2024
92aa249
Update patch to exclude lambda components
vasireddy99 Dec 27, 2024
dfd95af
use npm run build to build layer, fix lambda java patch
vasireddy99 Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,699 changes: 1,699 additions & 0 deletions OTEL_Version.patch
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion adot/collector/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.40.0
v0.42.0
4 changes: 2 additions & 2 deletions adot/collector/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ receivers:
endpoint: "localhost:4318"

exporters:
logging:
debug:
awsxray:

service:
Expand All @@ -17,7 +17,7 @@ service:
exporters: [awsxray]
metrics:
receivers: [otlp]
exporters: [logging]
exporters: [debug]
telemetry:
metrics:
address: localhost:8888
4 changes: 2 additions & 2 deletions adot/collector/lambdacomponents/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -59,7 +59,7 @@ func Components() (
awsxrayexporter.NewFactory(),
awsemfexporter.NewFactory(),
prometheusremotewriteexporter.NewFactory(),
loggingexporter.NewFactory(),
debugexporter.NewFactory(),
otlpexporter.NewFactory(),
otlphttpexporter.NewFactory(),
)
Expand Down
2 changes: 1 addition & 1 deletion adot/collector/lambdacomponents/default_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
253 changes: 139 additions & 114 deletions adot/collector/lambdacomponents/go.mod
View file
Open in desktop

Large diffs are not rendered by default.

845 changes: 278 additions & 567 deletions adot/collector/lambdacomponents/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions collector.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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{
Expand Down
6 changes: 3 additions & 3 deletions java/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions java/integration-tests/aws-sdk/wrapper/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 2 additions & 2 deletions java/integration-tests/okhttp/wrapper/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion nodejs/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions nodejs/wrapper-adot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
2 changes: 1 addition & 1 deletion opentelemetry-lambda
Open in desktop
Submodule opentelemetry-lambda updated 135 files
Loading
Loading