Revert decouple

solarwinds · Jan 23, 2024 · 18c70a6 · 18c70a6
1 parent dad0163
commit 18c70a6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/collector/config.yaml b/collector/config.yaml
@@ -12,8 +12,9 @@ receivers:
         endpoint: "localhost:4318"
 
 processors:
-  batch:
   decouple:
+  batch:
+    timeout: 5m
   resourcedetection:
     detectors: [env, system, lambda]
     timeout: 0.2s
@@ -37,11 +38,11 @@ service:
   pipelines:
     traces:
       receivers: [otlp]
-      processors: [resource,resourcedetection]
+      processors: [resource,resourcedetection,batch,decouple]
       exporters: [otlp,logging]
     metrics:
       receivers: [otlp]
-      processors: [resource,resourcedetection]
+      processors: [resource,resourcedetection,batch,decouple]
       exporters: [otlp,logging]
   telemetry:
     metrics:

diff --git a/collector/lambdacomponents/go.mod b/collector/lambdacomponents/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/open-telemetry/opentelemetry-lambda/collector/processor/coldstartprocessor v0.91.0
 	github.com/open-telemetry/opentelemetry-lambda/collector/processor/decoupleprocessor v0.0.0-00010101000000-000000000000
 	github.com/open-telemetry/opentelemetry-lambda/collector/receiver/telemetryapireceiver v0.91.0
-	github.com/solarwinds/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.0.0-20240122171432-f91142cef4e5
+	github.com/solarwinds/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.0.0-20240123053807-6890d5ec98df
 	go.opentelemetry.io/collector/exporter v0.91.0
 	go.opentelemetry.io/collector/exporter/loggingexporter v0.91.0
 	go.opentelemetry.io/collector/exporter/otlpexporter v0.91.0

diff --git a/collector/lambdacomponents/go.sum b/collector/lambdacomponents/go.sum
@@ -765,6 +765,7 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
 github.com/solarwinds/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.0.0-20231129225102-9b993ae9a355 h1:rdsMpfUpYPbwFg2P0WIJn4ifEKIWW6ca1hn7l8NaY4k=
 github.com/solarwinds/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.0.0-20231129225102-9b993ae9a355/go.mod h1:x3vM4tJ9INNZ9bGayt3bIKRve9sEd/9hq1NGeo1yLv0=
 github.com/solarwinds/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.0.0-20240122171432-f91142cef4e5/go.mod h1:P/whXlVmDSpboXaZ/KCOFV31HgeCWusJZrWX6IbzE2M=
+github.com/solarwinds/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.0.0-20240123053807-6890d5ec98df/go.mod h1:P/whXlVmDSpboXaZ/KCOFV31HgeCWusJZrWX6IbzE2M=
 github.com/solarwindscloud/apm-proto v0.0.0-20230912021952-7c5e94624446 h1:ENCOWJIayjKjr+B+sOqJjOCRBA9Oi+JMC242UaB9djY=
 github.com/solarwindscloud/apm-proto v0.0.0-20230912021952-7c5e94624446/go.mod h1:PIMzXc8HpB0ryT4Oci4pUz8F0m1X7Q/hVXkQE4jGv6Y=
 github.com/solarwindscloud/apm-proto v0.0.0-20231107001908-432e697887b6/go.mod h1:PIMzXc8HpB0ryT4Oci4pUz8F0m1X7Q/hVXkQE4jGv6Y=