From 938829ffa1cb142e8d7a0ad96cfb7f4cfb5bb671 Mon Sep 17 00:00:00 2001 From: Tommy Orndorff Date: Mon, 9 Sep 2024 21:09:00 -0700 Subject: [PATCH 1/5] adding the debug exporter --- collector/lambdacomponents/default.go | 2 ++ collector/lambdacomponents/go.mod | 1 + collector/lambdacomponents/go.sum | 2 ++ 3 files changed, 5 insertions(+) diff --git a/collector/lambdacomponents/default.go b/collector/lambdacomponents/default.go index 7beaf3ece1..26692ee86e 100644 --- a/collector/lambdacomponents/default.go +++ b/collector/lambdacomponents/default.go @@ -24,6 +24,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" "github.com/open-telemetry/opentelemetry-lambda/collector/processor/decoupleprocessor" "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/debugexporter" "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" @@ -52,6 +53,7 @@ func Components(extensionID string) (otelcol.Factories, error) { } exporters, err := exporter.MakeFactoryMap( + debugexporter.NewFactory(), loggingexporter.NewFactory(), otlpexporter.NewFactory(), otlphttpexporter.NewFactory(), diff --git a/collector/lambdacomponents/go.mod b/collector/lambdacomponents/go.mod index 5e24b438f6..3030a4900d 100644 --- a/collector/lambdacomponents/go.mod +++ b/collector/lambdacomponents/go.mod @@ -125,6 +125,7 @@ require ( go.opentelemetry.io/collector/connector v0.107.0 // indirect go.opentelemetry.io/collector/consumer v0.107.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect + go.opentelemetry.io/collector/exporter/debugexporter v0.107.0 // indirect go.opentelemetry.io/collector/extension/auth v0.107.0 // indirect go.opentelemetry.io/collector/featuregate v1.13.0 // indirect go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect diff --git a/collector/lambdacomponents/go.sum b/collector/lambdacomponents/go.sum index 5045a3766f..e7a0e3cfdd 100644 --- a/collector/lambdacomponents/go.sum +++ b/collector/lambdacomponents/go.sum @@ -253,6 +253,8 @@ go.opentelemetry.io/collector/consumer/consumertest v0.107.0 h1:BfjFHHAqbTmCN32a go.opentelemetry.io/collector/consumer/consumertest v0.107.0/go.mod h1:qNMedscdVyuxbV+wWUt4yGKQM3c0YEgQJTFeAtGZjRY= go.opentelemetry.io/collector/exporter v0.107.0 h1:Ioi2LfB+0HwU8A4kZsL/Lf1PghNlpEdShJal4DRkJ6g= go.opentelemetry.io/collector/exporter v0.107.0/go.mod h1:BpiJI2e8qY6kkkF0xpmEgbO102N+VTWd7qBYDFrnm0M= +go.opentelemetry.io/collector/exporter/debugexporter v0.107.0 h1:q095py+9wKZhAPz2e7LWBAdeAgwelinfGEgTW9iGKMM= +go.opentelemetry.io/collector/exporter/debugexporter v0.107.0/go.mod h1:Wb4bs9P75pZTsZiabeXbfHm1gzTm0R3aX1vFWivFQZE= go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0 h1:R0+duooEsbeInhgnPOFqQb4MNNuO61Qj9wtxx3MWCnE= go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0/go.mod h1:PmuS64CkJWmtgWFsb55aVoNlErUYG4ggHizegSjoMuo= go.opentelemetry.io/collector/exporter/otlpexporter v0.107.0 h1:4YTLYaihBZh8AdBcEDWrJTYXHtHu3JQagTa53Wu8iKQ= From 52430f7cf76f54b1120e53306ee7a64036c60492 Mon Sep 17 00:00:00 2001 From: Tommy Orndorff Date: Tue, 10 Sep 2024 09:36:07 -0700 Subject: [PATCH 2/5] running 'make gotidy' to update dependencies --- collector/go.mod | 1 + collector/go.sum | 2 ++ collector/lambdacomponents/go.mod | 2 +- collector/processor/coldstartprocessor/go.mod | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/collector/go.mod b/collector/go.mod index 58d31150e3..7134295ff4 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -150,6 +150,7 @@ require ( go.opentelemetry.io/collector/consumer v0.107.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect go.opentelemetry.io/collector/exporter v0.107.0 // indirect + go.opentelemetry.io/collector/exporter/debugexporter v0.107.0 // indirect go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0 // indirect go.opentelemetry.io/collector/exporter/otlpexporter v0.107.0 // indirect go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.0 // indirect diff --git a/collector/go.sum b/collector/go.sum index bb95a0042c..5ea1be5e60 100644 --- a/collector/go.sum +++ b/collector/go.sum @@ -271,6 +271,8 @@ go.opentelemetry.io/collector/consumer/consumertest v0.107.0 h1:BfjFHHAqbTmCN32a go.opentelemetry.io/collector/consumer/consumertest v0.107.0/go.mod h1:qNMedscdVyuxbV+wWUt4yGKQM3c0YEgQJTFeAtGZjRY= go.opentelemetry.io/collector/exporter v0.107.0 h1:Ioi2LfB+0HwU8A4kZsL/Lf1PghNlpEdShJal4DRkJ6g= go.opentelemetry.io/collector/exporter v0.107.0/go.mod h1:BpiJI2e8qY6kkkF0xpmEgbO102N+VTWd7qBYDFrnm0M= +go.opentelemetry.io/collector/exporter/debugexporter v0.107.0 h1:q095py+9wKZhAPz2e7LWBAdeAgwelinfGEgTW9iGKMM= +go.opentelemetry.io/collector/exporter/debugexporter v0.107.0/go.mod h1:Wb4bs9P75pZTsZiabeXbfHm1gzTm0R3aX1vFWivFQZE= go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0 h1:R0+duooEsbeInhgnPOFqQb4MNNuO61Qj9wtxx3MWCnE= go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0/go.mod h1:PmuS64CkJWmtgWFsb55aVoNlErUYG4ggHizegSjoMuo= go.opentelemetry.io/collector/exporter/otlpexporter v0.107.0 h1:4YTLYaihBZh8AdBcEDWrJTYXHtHu3JQagTa53Wu8iKQ= diff --git a/collector/lambdacomponents/go.mod b/collector/lambdacomponents/go.mod index 3030a4900d..d967dd4afd 100644 --- a/collector/lambdacomponents/go.mod +++ b/collector/lambdacomponents/go.mod @@ -16,6 +16,7 @@ require ( github.com/open-telemetry/opentelemetry-lambda/collector/processor/decoupleprocessor v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-lambda/collector/receiver/telemetryapireceiver v0.98.0 go.opentelemetry.io/collector/exporter v0.107.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.107.0 go.opentelemetry.io/collector/exporter/loggingexporter v0.107.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.107.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.107.0 @@ -125,7 +126,6 @@ require ( go.opentelemetry.io/collector/connector v0.107.0 // indirect go.opentelemetry.io/collector/consumer v0.107.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect - go.opentelemetry.io/collector/exporter/debugexporter v0.107.0 // indirect go.opentelemetry.io/collector/extension/auth v0.107.0 // indirect go.opentelemetry.io/collector/featuregate v1.13.0 // indirect go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect diff --git a/collector/processor/coldstartprocessor/go.mod b/collector/processor/coldstartprocessor/go.mod index d1b6147438..e82a5d7ebb 100644 --- a/collector/processor/coldstartprocessor/go.mod +++ b/collector/processor/coldstartprocessor/go.mod @@ -1,6 +1,7 @@ module github.com/open-telemetry/opentelemetry-lambda/collector/processor/coldstartprocessor -go 1.21 +go 1.21.0 + toolchain go1.22.5 require ( From 270d4e86892bd40c392f8c7f651e2a5af24b9659 Mon Sep 17 00:00:00 2001 From: Tommy Orndorff Date: Tue, 10 Sep 2024 09:43:16 -0700 Subject: [PATCH 3/5] noop --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 04527cdba0..f00b4c6784 100644 --- a/README.md +++ b/README.md @@ -127,3 +127,4 @@ Here is a list of community roles with current and previous members: - [Anthony Mirabella](https://github.com/Aneurysm9) Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md). + From d52b65555ea6b4f7d8f36e28f4d9c519d9ad96eb Mon Sep 17 00:00:00 2001 From: Tommy Orndorff Date: Tue, 10 Sep 2024 09:45:00 -0700 Subject: [PATCH 4/5] revert noop change --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index f00b4c6784..04527cdba0 100644 --- a/README.md +++ b/README.md @@ -127,4 +127,3 @@ Here is a list of community roles with current and previous members: - [Anthony Mirabella](https://github.com/Aneurysm9) Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md). - From 194e3c387e5324620714fbd16ea5174dfd9ef222 Mon Sep 17 00:00:00 2001 From: Tommy Orndorff Date: Tue, 10 Sep 2024 09:46:15 -0700 Subject: [PATCH 5/5] bumping ci workflow steps --- .github/workflows/ci-collector.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/ci-collector.yml b/.github/workflows/ci-collector.yml index 045144827d..13f0352aa3 100644 --- a/.github/workflows/ci-collector.yml +++ b/.github/workflows/ci-collector.yml @@ -1,18 +1,6 @@ name: "Continuous Build (Collector)" -on: - push: - paths: - - 'collector/**' - - '.github/workflows/ci-collector.yml' - branches: - - main - pull_request: - paths: - - 'collector/**' - - '.github/workflows/ci-collector.yml' - branches: - - main +on: [push, pull_request] jobs: test: