Modify patches and update sub module (#908)

* Create patch version

* Create patch version

* Modify Patches and go build.sh

* Patches updated to the upstream sub module

* update lambda sub module

* correct the version patch

Author: vasireddy99

OTEL_Version.patch

@@ -1,5 +1,5 @@
 diff --git a/collector/internal/collector/collector.go b/collector/internal/collector/collector.go
-index 35aaa18..46af9b7 100644
+index 35aaa18..c3e56fa 100644
 --- a/collector/internal/collector/collector.go
 +++ b/collector/internal/collector/collector.go
 @@ -26,6 +26,7 @@ import (
@@ -10,7 +10,29 @@ index 35aaa18..46af9b7 100644
  	"go.opentelemetry.io/collector/confmap/provider/yamlprovider"
  	"go.opentelemetry.io/collector/otelcol"
  	"go.uber.org/zap"
-@@ -59,7 +60,15 @@ func getConfig(logger *zap.Logger) string {
+@@ -38,13 +39,14 @@ import (
+ // Collector runs a single otelcol as a go routine within the
+ // same process as the executor.
+ type Collector struct {
+-	factories      otelcol.Factories
+-	configProvider otelcol.ConfigProvider
+-	svc            *otelcol.Collector
+-	appDone        chan struct{}
+-	stopped        bool
+-	logger         *zap.Logger
+-	version        string
++	factories              otelcol.Factories
++	configProvider         otelcol.ConfigProvider
++	configProviderSettings otelcol.ConfigProviderSettings
++	svc                    *otelcol.Collector
++	appDone                chan struct{}
++	stopped                bool
++	logger                 *zap.Logger
++	version                string
+ }
+ 
+ func getConfig(logger *zap.Logger) string {
+@@ -59,7 +61,15 @@ func getConfig(logger *zap.Logger) string {
  func NewCollector(logger *zap.Logger, factories otelcol.Factories, version string) *Collector {
  	l := logger.Named("NewCollector")
  	providerSettings := confmap.ProviderSettings{Logger: l}
@@ -27,7 +49,23 @@ index 35aaa18..46af9b7 100644
  	mapProvider := make(map[string]confmap.Provider, len(providers))
 
  	for _, provider := range providers {
-@@ -93,8 +102,8 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
+@@ -82,10 +92,11 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
+ 	}
+ 
+ 	col := &Collector{
+-		factories:      factories,
+-		configProvider: cfgProvider,
+-		logger:         logger,
+-		version:        version,
++		factories:              factories,
++		configProvider:         cfgProvider,
++		configProviderSettings: cfgSet,
++		logger:                 logger,
++		version:                version,
+ 	}
+ 	return col
+ }
+@@ -93,11 +104,11 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
  func (c *Collector) Start(ctx context.Context) error {
  	params := otelcol.CollectorSettings{
  		BuildInfo: component.BuildInfo{
@@ -37,4 +75,8 @@ index 35aaa18..46af9b7 100644
 +			Description: "ADOT Lambda Collector",
  			Version:     c.version,
  		},
- 		ConfigProvider: c.configProvider,
+-		ConfigProvider: c.configProvider,
++		ConfigProviderSettings: c.configProviderSettings,
+ 		Factories: func() (otelcol.Factories, error) {
+ 			return c.factories, nil
+ 		},

collector.patch

@@ -66,6 +66,7 @@ exporters:
   awsxray:
   prometheusremotewrite:
     endpoint: "${aws_prometheus_workspace.test_amp_workspace[0].prometheus_endpoint}api/v1/remote_write"
+    add_metric_suffixes: false
     auth:
       authenticator: sigv4auth
 

java/integration-tests/aws-sdk/agent/main.tf

@@ -56,6 +56,7 @@ exporters:
   awsxray:
   prometheusremotewrite:
     endpoint: "${aws_prometheus_workspace.test_amp_workspace[0].prometheus_endpoint}api/v1/remote_write"
+    add_metric_suffixes: false
     auth:
       authenticator: sigv4auth