diff --git a/.github/workflows/serverless-integration.yml b/.github/workflows/serverless-integration.yml index b3319bc5f64d9..e2bec6b45ed8f 100644 --- a/.github/workflows/serverless-integration.yml +++ b/.github/workflows/serverless-integration.yml @@ -24,7 +24,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 14 - + - name: Install Serverless Framework run: sudo yarn global add serverless@^3.7.9 --prefix /usr/local @@ -45,8 +45,13 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Run tests if AWS credentials are available + uses: nick-fields/retry@v2 env: AWS_ACCESS_KEY_ID: ${{ secrets.SERVERLESS_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SERVERLESS_AWS_SECRET_ACCESS_KEY }} - run: ARCHITECTURE=${{ matrix.architecture }} ./test/integration/serverless/run.sh - working-directory: go/src/github.com/DataDog/datadog-agent \ No newline at end of file + AWS_SECRET_ACCESS_KEY: ${{ secrets.SERVERLESS_AWS_SECRET_ACCESS_KEY }} + with: + timeout_minutes: 30 + max_attempts: 2 + command: | + cd go/src/github.com/DataDog/datadog-agent + ARCHITECTURE=${{ matrix.architecture }} ./test/integration/serverless/run.sh diff --git a/cmd/serverless-init/main.go b/cmd/serverless-init/main.go index b1fd96e456758..c3e893c7a7d42 100644 --- a/cmd/serverless-init/main.go +++ b/cmd/serverless-init/main.go @@ -19,6 +19,7 @@ import ( "github.com/DataDog/datadog-agent/cmd/serverless-init/tag" "github.com/DataDog/datadog-agent/pkg/config" "github.com/DataDog/datadog-agent/pkg/serverless/metrics" + "github.com/DataDog/datadog-agent/pkg/serverless/random" "github.com/DataDog/datadog-agent/pkg/serverless/trace" ) @@ -50,7 +51,7 @@ func main() { } func setupTraceAgent(traceAgent *trace.ServerlessTraceAgent, tags map[string]string) { - traceAgent.Start(config.Datadog.GetBool("apm_config.enabled"), &trace.LoadConfig{Path: datadogConfigPath}, nil) + traceAgent.Start(config.Datadog.GetBool("apm_config.enabled"), &trace.LoadConfig{Path: datadogConfigPath}, nil, random.Random.Uint64()) traceAgent.SetTags(tag.GetBaseTagsMapWithMetadata(tags)) for range time.Tick(3 * time.Second) { traceAgent.Flush() diff --git a/cmd/serverless/main.go b/cmd/serverless/main.go index ec2ab86e46845..8df920768aef2 100644 --- a/cmd/serverless/main.go +++ b/cmd/serverless/main.go @@ -24,9 +24,11 @@ import ( serverlessLogs "github.com/DataDog/datadog-agent/pkg/serverless/logs" "github.com/DataDog/datadog-agent/pkg/serverless/metrics" "github.com/DataDog/datadog-agent/pkg/serverless/proxy" + "github.com/DataDog/datadog-agent/pkg/serverless/random" "github.com/DataDog/datadog-agent/pkg/serverless/registration" "github.com/DataDog/datadog-agent/pkg/serverless/trace" "github.com/DataDog/datadog-agent/pkg/serverless/trace/inferredspan" + "github.com/DataDog/datadog-agent/pkg/trace/pb" "github.com/DataDog/datadog-agent/pkg/util/flavor" "github.com/DataDog/datadog-agent/pkg/util/log" ) @@ -211,11 +213,14 @@ func runAgent(stopCh chan struct{}) (serverlessDaemon *daemon.Daemon, err error) } config.LoadProxyFromEnv(config.Datadog) logChannel := make(chan *logConfig.ChannelMessage) - + // Channels for ColdStartCreator + lambdaSpanChan := make(chan *pb.Span) + initDurationChan := make(chan float64) + coldStartSpanId := random.Random.Uint64() metricAgent := &metrics.ServerlessMetricAgent{} metricAgent.Start(daemon.FlushTimeout, &metrics.MetricConfig{}, &metrics.MetricDogStatsD{}) serverlessDaemon.SetStatsdServer(metricAgent) - serverlessDaemon.SetupLogCollectionHandler(logsAPICollectionRoute, logChannel, config.Datadog.GetBool("serverless.logs_enabled"), config.Datadog.GetBool("enhanced_metrics")) + serverlessDaemon.SetupLogCollectionHandler(logsAPICollectionRoute, logChannel, config.Datadog.GetBool("serverless.logs_enabled"), config.Datadog.GetBool("enhanced_metrics"), initDurationChan) // Concurrently start heavyweight features var wg sync.WaitGroup @@ -225,7 +230,7 @@ func runAgent(stopCh chan struct{}) (serverlessDaemon *daemon.Daemon, err error) go func() { defer wg.Done() traceAgent := &trace.ServerlessTraceAgent{} - traceAgent.Start(config.Datadog.GetBool("apm_config.enabled"), &trace.LoadConfig{Path: datadogConfigPath}, serverlessDaemon.ExecutionContext) + traceAgent.Start(config.Datadog.GetBool("apm_config.enabled"), &trace.LoadConfig{Path: datadogConfigPath}, lambdaSpanChan, coldStartSpanId) serverlessDaemon.SetTraceAgent(traceAgent) }() @@ -269,6 +274,19 @@ func runAgent(stopCh chan struct{}) (serverlessDaemon *daemon.Daemon, err error) wg.Wait() + coldStartSpanCreator := &trace.ColdStartSpanCreator{ + LambdaSpanChan: lambdaSpanChan, + InitDurationChan: initDurationChan, + TraceAgent: serverlessDaemon.TraceAgent, + StopChan: make(chan struct{}), + ColdStartSpanId: coldStartSpanId, + } + + log.Debug("Starting ColdStartSpanCreator") + coldStartSpanCreator.Run() + log.Debug("Setting ColdStartSpanCreator on Daemon") + serverlessDaemon.SetColdStartSpanCreator(coldStartSpanCreator) + // set up invocation processor in the serverless Daemon to be used for the proxy and/or lifecycle API serverlessDaemon.InvocationProcessor = &invocationlifecycle.LifecycleProcessor{ ExtraTags: serverlessDaemon.ExtraTags, diff --git a/pkg/serverless/daemon/daemon.go b/pkg/serverless/daemon/daemon.go index 5e623ae168b1c..22d1c228da9f8 100644 --- a/pkg/serverless/daemon/daemon.go +++ b/pkg/serverless/daemon/daemon.go @@ -40,6 +40,8 @@ type Daemon struct { TraceAgent *trace.ServerlessTraceAgent + ColdStartCreator *trace.ColdStartSpanCreator + // lastInvocations stores last invocation times to be able to compute the // interval of invocation of the function. lastInvocations []time.Time @@ -164,10 +166,10 @@ func (d *Daemon) GetFlushStrategy() string { } // SetupLogCollectionHandler configures the log collection route handler -func (d *Daemon) SetupLogCollectionHandler(route string, logsChan chan *logConfig.ChannelMessage, logsEnabled bool, enhancedMetricsEnabled bool) { +func (d *Daemon) SetupLogCollectionHandler(route string, logsChan chan *logConfig.ChannelMessage, logsEnabled bool, enhancedMetricsEnabled bool, initDurationChan chan<- float64) { d.logCollector = serverlessLog.NewLambdaLogCollector(logsChan, - d.MetricAgent.Demux, d.ExtraTags, logsEnabled, enhancedMetricsEnabled, d.ExecutionContext, d.HandleRuntimeDone) + d.MetricAgent.Demux, d.ExtraTags, logsEnabled, enhancedMetricsEnabled, d.ExecutionContext, d.HandleRuntimeDone, initDurationChan) server := serverlessLog.NewLambdaLogsAPIServer(d.logCollector.In) d.mux.Handle(route, &server) @@ -184,6 +186,10 @@ func (d *Daemon) SetTraceAgent(traceAgent *trace.ServerlessTraceAgent) { d.TraceAgent = traceAgent } +func (d *Daemon) SetColdStartSpanCreator(creator *trace.ColdStartSpanCreator) { + d.ColdStartCreator = creator +} + // SetFlushStrategy sets the flush strategy to use. func (d *Daemon) SetFlushStrategy(strategy flush.Strategy) { log.Debugf("Set flush strategy: %s (was: %s)", strategy.String(), d.GetFlushStrategy()) @@ -305,6 +311,10 @@ func (d *Daemon) Stop() { if d.MetricAgent != nil { d.MetricAgent.Stop() } + + if d.ColdStartCreator != nil { + d.ColdStartCreator.Stop() + } logs.Stop() log.Debug("Serverless agent shutdown complete") } diff --git a/pkg/serverless/daemon/daemon_test.go b/pkg/serverless/daemon/daemon_test.go index abe9e3aa59caf..57b90701f4cc2 100644 --- a/pkg/serverless/daemon/daemon_test.go +++ b/pkg/serverless/daemon/daemon_test.go @@ -16,7 +16,9 @@ import ( "github.com/stretchr/testify/assert" + "github.com/DataDog/datadog-agent/pkg/serverless/random" "github.com/DataDog/datadog-agent/pkg/serverless/trace" + "github.com/DataDog/datadog-agent/pkg/trace/pb" "github.com/DataDog/datadog-agent/pkg/trace/testutil" ) @@ -163,7 +165,7 @@ func TestSetTraceTagOk(t *testing.T) { } var agent = &trace.ServerlessTraceAgent{} t.Setenv("DD_API_KEY", "x") - agent.Start(true, &trace.LoadConfig{Path: "/does-not-exist.yml"}, nil) + agent.Start(true, &trace.LoadConfig{Path: "/does-not-exist.yml"}, make(chan *pb.Span), random.Random.Uint64()) defer agent.Stop() d := Daemon{ TraceAgent: agent, diff --git a/pkg/serverless/daemon/routes.go b/pkg/serverless/daemon/routes.go index 5404bc87c387c..b2459ce26e2db 100644 --- a/pkg/serverless/daemon/routes.go +++ b/pkg/serverless/daemon/routes.go @@ -103,7 +103,6 @@ func (e *EndInvocation) ServeHTTP(w http.ResponseWriter, r *http.Request) { IsError: r.Header.Get(invocationlifecycle.InvocationErrorHeader) == "true", RequestID: ecs.LastRequestID, ResponseRawPayload: responseBody, - ColdStartDuration: ecs.ColdstartDuration, } executionContext := e.daemon.InvocationProcessor.GetExecutionInfo() if executionContext.TraceID == 0 { diff --git a/pkg/serverless/executioncontext/executioncontext.go b/pkg/serverless/executioncontext/executioncontext.go index 5669bc8a22133..83140922dd41a 100644 --- a/pkg/serverless/executioncontext/executioncontext.go +++ b/pkg/serverless/executioncontext/executioncontext.go @@ -23,7 +23,6 @@ type ExecutionContext struct { coldstartRequestID string lastLogRequestID string coldstart bool - coldstartDuration float64 startTime time.Time endTime time.Time } @@ -35,7 +34,6 @@ type State struct { ColdstartRequestID string LastLogRequestID string Coldstart bool - ColdstartDuration float64 StartTime time.Time EndTime time.Time } @@ -50,18 +48,11 @@ func (ec *ExecutionContext) GetCurrentState() State { ColdstartRequestID: ec.coldstartRequestID, LastLogRequestID: ec.lastLogRequestID, Coldstart: ec.coldstart, - ColdstartDuration: ec.coldstartDuration, StartTime: ec.startTime, EndTime: ec.endTime, } } -func (ec *ExecutionContext) SetColdStartDuration(duration float64) { - ec.m.Lock() - defer ec.m.Unlock() - ec.coldstartDuration = duration -} - // SetFromInvocation sets the execution context based on an invocation func (ec *ExecutionContext) SetFromInvocation(arn string, requestID string) { ec.m.Lock() diff --git a/pkg/serverless/invocationlifecycle/invocation_details.go b/pkg/serverless/invocationlifecycle/invocation_details.go index 94fad5bd70d01..7dcc6d8f92bfb 100644 --- a/pkg/serverless/invocationlifecycle/invocation_details.go +++ b/pkg/serverless/invocationlifecycle/invocation_details.go @@ -37,5 +37,4 @@ type InvocationEndDetails struct { IsError bool RequestID string ResponseRawPayload []byte - ColdStartDuration float64 } diff --git a/pkg/serverless/invocationlifecycle/lifecycle_test.go b/pkg/serverless/invocationlifecycle/lifecycle_test.go index 59b316007dfb3..872c0ad18dba7 100644 --- a/pkg/serverless/invocationlifecycle/lifecycle_test.go +++ b/pkg/serverless/invocationlifecycle/lifecycle_test.go @@ -735,7 +735,7 @@ func TestTriggerTypesLifecycleEventForKinesis(t *testing.T) { RequestID: "test-request-id", }) assert.Equal(t, map[string]string{ - "function_trigger.event_source_arn": "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream", + "function_trigger.event_source_arn": "arn:aws:kinesis:sa-east-1:425362996713:stream/kinesisStream", "request_id": "test-request-id", "function_trigger.event_source": "kinesis", }, testProcessor.GetTags()) @@ -779,7 +779,7 @@ func TestTriggerTypesLifecycleEventForSNS(t *testing.T) { RequestID: "test-request-id", }) assert.Equal(t, map[string]string{ - "function_trigger.event_source_arn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "function_trigger.event_source_arn": "arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy", "request_id": "test-request-id", "function_trigger.event_source": "sns", }, testProcessor.GetTags()) @@ -801,7 +801,7 @@ func TestTriggerTypesLifecycleEventForSQS(t *testing.T) { RequestID: "test-request-id", }) assert.Equal(t, map[string]string{ - "function_trigger.event_source_arn": "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", + "function_trigger.event_source_arn": "arn:aws:sqs:sa-east-1:425362996713:InferredSpansQueueNode", "request_id": "test-request-id", "function_trigger.event_source": "sqs", }, testProcessor.GetTags()) diff --git a/pkg/serverless/logs/logs_collector.go b/pkg/serverless/logs/logs_collector.go index 3e7668999fe94..69112847c2bf0 100644 --- a/pkg/serverless/logs/logs_collector.go +++ b/pkg/serverless/logs/logs_collector.go @@ -46,6 +46,7 @@ type LambdaLogsCollector struct { invocationEndTime time.Time process_once *sync.Once executionContext *executioncontext.ExecutionContext + initDurationChan chan<- float64 arn string @@ -53,7 +54,7 @@ type LambdaLogsCollector struct { handleRuntimeDone func() } -func NewLambdaLogCollector(out chan<- *logConfig.ChannelMessage, demux aggregator.Demultiplexer, extraTags *Tags, logsEnabled bool, enhancedMetricsEnabled bool, executionContext *executioncontext.ExecutionContext, handleRuntimeDone func()) *LambdaLogsCollector { +func NewLambdaLogCollector(out chan<- *logConfig.ChannelMessage, demux aggregator.Demultiplexer, extraTags *Tags, logsEnabled bool, enhancedMetricsEnabled bool, executionContext *executioncontext.ExecutionContext, handleRuntimeDone func(), initDurationChan chan<- float64) *LambdaLogsCollector { return &LambdaLogsCollector{ In: make(chan []LambdaLogAPIMessage, maxBufferedLogs), // Buffered, so we can hold start-up logs before first invocation without blocking @@ -65,6 +66,7 @@ func NewLambdaLogCollector(out chan<- *logConfig.ChannelMessage, demux aggregato executionContext: executionContext, handleRuntimeDone: handleRuntimeDone, process_once: &sync.Once{}, + initDurationChan: initDurationChan, } } @@ -170,7 +172,7 @@ func (lc *LambdaLogsCollector) processMessage( return } if message.logType == logTypePlatformInitReport { - lc.executionContext.SetColdStartDuration(message.objectRecord.reportLogItem.initDurationTelemetry) + lc.initDurationChan <- message.objectRecord.reportLogItem.initDurationTelemetry } if message.logType == logTypePlatformStart { diff --git a/pkg/serverless/logs/logs_test.go b/pkg/serverless/logs/logs_test.go index 088c552ce15fc..0b6668bbb55ea 100644 --- a/pkg/serverless/logs/logs_test.go +++ b/pkg/serverless/logs/logs_test.go @@ -211,7 +211,7 @@ func TestProcessMessageValid(t *testing.T) { tags := Tags{ Tags: metricTags, } - lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}) + lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}, make(chan<- float64)) lc.processMessage(&message) @@ -255,7 +255,7 @@ func TestProcessMessageStartValid(t *testing.T) { tags := Tags{ Tags: metricTags, } - lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, mockRuntimeDone) + lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, mockRuntimeDone, make(chan<- float64)) lc.lastRequestID = lastRequestID lc.processMessage(message) assert.Equal(t, runtimeDoneCallbackWasCalled, false) @@ -287,7 +287,7 @@ func TestProcessMessagePlatformRuntimeDoneValid(t *testing.T) { mockRuntimeDone := func() { runtimeDoneCallbackWasCalled = true } - lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, mockRuntimeDone) + lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, mockRuntimeDone, make(chan<- float64)) lc.lastRequestID = lastRequestID lc.processMessage(&message) ecs := mockExecutionContext.GetCurrentState() @@ -323,7 +323,7 @@ func TestProcessMessagePlatformRuntimeDonePreviousInvocation(t *testing.T) { mockRuntimeDone := func() { runtimeDoneCallbackWasCalled = true } - lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, mockRuntimeDone) + lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, mockRuntimeDone, make(chan<- float64)) lc.processMessage(message) // Runtime done callback should NOT be called if the log message was for a previous invocation @@ -355,7 +355,7 @@ func TestProcessMessageShouldNotProcessArnNotSet(t *testing.T) { mockExecutionContext := &executioncontext.ExecutionContext{} computeEnhancedMetrics := true - lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}) + lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}, make(chan<- float64)) go lc.processMessage(message) @@ -383,7 +383,7 @@ func TestProcessMessageShouldNotProcessLogsDropped(t *testing.T) { mockExecutionContext := &executioncontext.ExecutionContext{} mockExecutionContext.SetFromInvocation(arn, lastRequestID) - lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}) + lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}, make(chan<- float64)) go lc.processMessage(message) @@ -412,7 +412,7 @@ func TestProcessMessageShouldProcessLogTypeFunction(t *testing.T) { mockExecutionContext := &executioncontext.ExecutionContext{} mockExecutionContext.SetFromInvocation(arn, lastRequestID) - lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}) + lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}, make(chan<- float64)) go lc.processMessage(message) @@ -860,7 +860,7 @@ func TestRuntimeMetricsMatchLogs(t *testing.T) { }, }, } - lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}) + lc := NewLambdaLogCollector(make(chan<- *config.ChannelMessage), demux, &tags, true, computeEnhancedMetrics, mockExecutionContext, func() {}, make(chan<- float64)) lc.invocationStartTime = startTime lc.processMessage(doneMessage) diff --git a/pkg/serverless/serverless_test.go b/pkg/serverless/serverless_test.go index 2dc6e88ed5a23..780921373a501 100644 --- a/pkg/serverless/serverless_test.go +++ b/pkg/serverless/serverless_test.go @@ -101,14 +101,14 @@ func TestComputeTimeout(t *testing.T) { } func TestRemoveQualifierFromArnWithAlias(t *testing.T) { - invokedFunctionArn := "arn:aws:lambda:eu-south-1:601427279990:function:inferred-spans-function-urls-dev-harv-function-urls:$latest" + invokedFunctionArn := "arn:aws:lambda:eu-south-1:425362996713:function:inferred-spans-function-urls-dev-harv-function-urls:$latest" functionArn := removeQualifierFromArn(invokedFunctionArn) - expectedArn := "arn:aws:lambda:eu-south-1:601427279990:function:inferred-spans-function-urls-dev-harv-function-urls" + expectedArn := "arn:aws:lambda:eu-south-1:425362996713:function:inferred-spans-function-urls-dev-harv-function-urls" assert.Equal(t, functionArn, expectedArn) } func TestRemoveQualifierFromArnWithoutAlias(t *testing.T) { - invokedFunctionArn := "arn:aws:lambda:eu-south-1:601427279990:function:inferred-spans-function-urls-dev-harv-function-urls" + invokedFunctionArn := "arn:aws:lambda:eu-south-1:425362996713:function:inferred-spans-function-urls-dev-harv-function-urls" functionArn := removeQualifierFromArn(invokedFunctionArn) assert.Equal(t, functionArn, invokedFunctionArn) } diff --git a/pkg/serverless/trace/cold_start_span_creator.go b/pkg/serverless/trace/cold_start_span_creator.go index ef21eef9c777c..f4a5fa8e24d9f 100644 --- a/pkg/serverless/trace/cold_start_span_creator.go +++ b/pkg/serverless/trace/cold_start_span_creator.go @@ -9,8 +9,6 @@ import ( "os" "sync" - "github.com/DataDog/datadog-agent/pkg/serverless/executioncontext" - "github.com/DataDog/datadog-agent/pkg/serverless/trace/inferredspan" "github.com/DataDog/datadog-agent/pkg/trace/api" "github.com/DataDog/datadog-agent/pkg/trace/info" "github.com/DataDog/datadog-agent/pkg/trace/pb" @@ -35,45 +33,99 @@ const ( var functionName = os.Getenv(functionNameEnvVar) type ColdStartSpanCreator struct { - executionContext *executioncontext.ExecutionContext - traceAgent *ServerlessTraceAgent - createSpan *sync.Once + TraceAgent *ServerlessTraceAgent + createSpan sync.Once + LambdaSpanChan <-chan *pb.Span + InitDurationChan <-chan float64 + syncSpanDurationMutex sync.Mutex + ColdStartSpanId uint64 + lambdaSpan *pb.Span + initDuration float64 + StopChan chan struct{} } -func (c *ColdStartSpanCreator) create(lambdaSpan *pb.Span) { - // Prevent infinite loop from SpanModifier call - if lambdaSpan.Name == "aws.lambda.cold_start" { +func (c *ColdStartSpanCreator) Run() { + go func() { + for { + select { + case traceAgentSpan := <-c.LambdaSpanChan: + c.handleLambdaSpan(traceAgentSpan) + + case initDuration := <-c.InitDurationChan: + c.handleInitDuration(initDuration) + + case <-c.StopChan: + log.Debugf("[ColdStartCreator] - shutting down") + return + } + } + }() +} + +func (c *ColdStartSpanCreator) Stop() { + log.Debugf("[ColdStartCreator] - sending shutdown msg") + c.StopChan <- struct{}{} +} + +func (c *ColdStartSpanCreator) handleLambdaSpan(traceAgentSpan *pb.Span) { + if traceAgentSpan.Name == spanName { return } - ecs := c.executionContext.GetCurrentState() - if !ecs.Coldstart || ecs.ColdstartDuration == 0 { + c.syncSpanDurationMutex.Lock() + defer c.syncSpanDurationMutex.Unlock() + + c.lambdaSpan = traceAgentSpan + c.createIfReady() +} + +func (c *ColdStartSpanCreator) handleInitDuration(initDuration float64) { + c.syncSpanDurationMutex.Lock() + defer c.syncSpanDurationMutex.Unlock() + c.initDuration = initDuration + c.createIfReady() +} - log.Debugf("[ColdStartSpanCreator] Skipping span creation - no duration received") +func (c *ColdStartSpanCreator) createIfReady() { + + if c.initDuration == 0 { + log.Debug("[ColdStartCreator] No init duration, passing") + return + } + if c.lambdaSpan == nil { + log.Debug("[ColdStartCreator] No lambda span, passing") + return + } + c.create() +} + +func (c *ColdStartSpanCreator) create() { + // Prevent infinite loop from SpanModifier call + if c.lambdaSpan.Name == spanName { return } // ColdStartDuration is given in milliseconds // APM spans are in nanoseconds // millis = nanos * 1e6 - durationNs := ecs.ColdstartDuration * 1e6 + durationNs := c.initDuration * 1e6 coldStartSpan := &pb.Span{ Service: service, Name: spanName, Resource: functionName, - SpanID: inferredspan.GenerateSpanId(), - TraceID: lambdaSpan.TraceID, - ParentID: lambdaSpan.ParentID, - Start: lambdaSpan.Start - int64(durationNs), + SpanID: c.ColdStartSpanId, + TraceID: c.lambdaSpan.TraceID, + ParentID: c.lambdaSpan.ParentID, + Start: c.lambdaSpan.Start - int64(durationNs), Duration: int64(durationNs), + Type: "serverless", } - log.Debugf("[ColdStartSpanCreator] Lambda span %v", lambdaSpan) c.createSpan.Do(func() { c.processSpan(coldStartSpan) }) } func (c *ColdStartSpanCreator) processSpan(coldStartSpan *pb.Span) { - log.Debugf("[ColdStartSpanCreator] Creating cold start span %v", coldStartSpan) + log.Debugf("[ColdStartCreator] Creating cold start span %v", coldStartSpan) traceChunk := &pb.TraceChunk{ Origin: "lambda", @@ -85,7 +137,7 @@ func (c *ColdStartSpanCreator) processSpan(coldStartSpan *pb.Span) { Chunks: []*pb.TraceChunk{traceChunk}, } - c.traceAgent.ta.Process(&api.Payload{ + c.TraceAgent.ta.Process(&api.Payload{ Source: info.NewReceiverStats().GetTagStats(info.Tags{}), TracerPayload: tracerPayload, }) diff --git a/pkg/serverless/trace/cold_start_span_creator_test.go b/pkg/serverless/trace/cold_start_span_creator_test.go index beccba3f7d347..b220b1306b2fd 100644 --- a/pkg/serverless/trace/cold_start_span_creator_test.go +++ b/pkg/serverless/trace/cold_start_span_creator_test.go @@ -7,13 +7,11 @@ package trace import ( "context" - "sync" "testing" "time" "github.com/stretchr/testify/assert" - "github.com/DataDog/datadog-agent/pkg/serverless/executioncontext" "github.com/DataDog/datadog-agent/pkg/serverless/random" "github.com/DataDog/datadog-agent/pkg/trace/agent" @@ -31,19 +29,24 @@ func TestColdStartSpanCreatorCreateValid(t *testing.T) { traceAgent := &ServerlessTraceAgent{ ta: agnt, } - testArn := "arn:aws:lambda:us-east-1:123456789012:function:MY-SUPER-function" - testColdStartID := "8286a188-ba32-4475-8077-530cd35c09a9" + coldStartDuration := 50.0 // Given in millis - ec := &executioncontext.ExecutionContext{} - ec.SetColdStartDuration(coldStartDuration) - ec.SetFromInvocation(testArn, testColdStartID) + lambdaSpanChan := make(chan *pb.Span) + initDurationChan := make(chan float64) + stopChan := make(chan struct{}) + coldStartSpanId := random.Random.Uint64() coldStartSpanCreator := &ColdStartSpanCreator{ - executionContext: ec, - traceAgent: traceAgent, - createSpan: &sync.Once{}, + TraceAgent: traceAgent, + LambdaSpanChan: lambdaSpanChan, + InitDurationChan: initDurationChan, + ColdStartSpanId: coldStartSpanId, + StopChan: stopChan, } + coldStartSpanCreator.Run() + defer coldStartSpanCreator.Stop() + now := time.Now().UnixNano() lambdaSpan := &pb.Span{ Service: "aws.lambda", @@ -54,8 +57,10 @@ func TestColdStartSpanCreatorCreateValid(t *testing.T) { ParentID: random.Random.Uint64(), Duration: 500000000, } - coldStartSpanCreator.create(lambdaSpan) - timeout := time.After(2 * time.Second) + lambdaSpanChan <- lambdaSpan + initDurationChan <- coldStartDuration + + timeout := time.After(2 * time.Millisecond) var span *pb.Span select { case ss := <-traceAgent.ta.TraceWriter.In: @@ -80,18 +85,22 @@ func TestColdStartSpanCreatorCreateDuplicate(t *testing.T) { traceAgent := &ServerlessTraceAgent{ ta: agnt, } - testArn := "arn:aws:lambda:us-east-1:123456789012:function:MY-SUPER-function" - testColdStartID := "8286a188-ba32-4475-8077-530cd35c09a9" - ec := &executioncontext.ExecutionContext{} - ec.SetColdStartDuration(50) - ec.SetFromInvocation(testArn, testColdStartID) - + coldStartDuration := 50.0 // Given in millis + lambdaSpanChan := make(chan *pb.Span) + initDurationChan := make(chan float64) + stopChan := make(chan struct{}) + coldStartSpanId := random.Random.Uint64() coldStartSpanCreator := &ColdStartSpanCreator{ - executionContext: ec, - traceAgent: traceAgent, - createSpan: &sync.Once{}, + TraceAgent: traceAgent, + LambdaSpanChan: lambdaSpanChan, + InitDurationChan: initDurationChan, + ColdStartSpanId: coldStartSpanId, + StopChan: stopChan, } + coldStartSpanCreator.Run() + defer coldStartSpanCreator.Stop() + lambdaSpan := &pb.Span{ Service: "aws.lambda", Name: "aws.lambda.cold_start", @@ -101,8 +110,9 @@ func TestColdStartSpanCreatorCreateDuplicate(t *testing.T) { ParentID: random.Random.Uint64(), Duration: 500, } - coldStartSpanCreator.create(lambdaSpan) - timeout := time.After(time.Second) + lambdaSpanChan <- lambdaSpan + initDurationChan <- coldStartDuration + timeout := time.After(time.Millisecond) timedOut := false select { case ss := <-traceAgent.ta.TraceWriter.In: @@ -123,25 +133,34 @@ func TestColdStartSpanCreatorNotColdStart(t *testing.T) { traceAgent := &ServerlessTraceAgent{ ta: agnt, } - ec := &executioncontext.ExecutionContext{} - + lambdaSpanChan := make(chan *pb.Span) + initDurationChan := make(chan float64) + stopChan := make(chan struct{}) + coldStartSpanId := random.Random.Uint64() coldStartSpanCreator := &ColdStartSpanCreator{ - executionContext: ec, - traceAgent: traceAgent, - createSpan: &sync.Once{}, + TraceAgent: traceAgent, + LambdaSpanChan: lambdaSpanChan, + InitDurationChan: initDurationChan, + ColdStartSpanId: coldStartSpanId, + StopChan: stopChan, } + coldStartSpanCreator.Run() + defer coldStartSpanCreator.Stop() + lambdaSpan := &pb.Span{ Service: "aws.lambda", - Name: "aws.lambda.cold_start", + Name: "aws.lambda.my-function", Start: time.Now().Unix(), TraceID: random.Random.Uint64(), SpanID: random.Random.Uint64(), ParentID: random.Random.Uint64(), Duration: 500, } - coldStartSpanCreator.create(lambdaSpan) - timeout := time.After(time.Second) + lambdaSpanChan <- lambdaSpan + // Don't write to initDurationChan, as this is not a cold start + + timeout := time.After(time.Millisecond) timedOut := false select { case ss := <-traceAgent.ta.TraceWriter.In: diff --git a/pkg/serverless/trace/inferredspan/span_enrichment_test.go b/pkg/serverless/trace/inferredspan/span_enrichment_test.go index 1cf1c1219f306..6e19ebebc6489 100644 --- a/pkg/serverless/trace/inferredspan/span_enrichment_test.go +++ b/pkg/serverless/trace/inferredspan/span_enrichment_test.go @@ -197,7 +197,7 @@ func TestEnrichInferredSpanWithSNSEvent(t *testing.T) { assert.Equal(t, "aws.sns", span.Meta[operationName]) assert.Equal(t, "serverlessTracingTopicPy", span.Meta[resourceNames]) assert.Equal(t, "Hello", span.Meta[subject]) - assert.Equal(t, "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", span.Meta[topicARN]) + assert.Equal(t, "arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy", span.Meta[topicARN]) assert.Equal(t, "serverlessTracingTopicPy", span.Meta[topicName]) assert.Equal(t, "Notification", span.Meta[metadataType]) assert.True(t, inferredSpan.IsAsync) @@ -261,7 +261,7 @@ func TestEnrichInferredSpanWithSQSEvent(t *testing.T) { assert.Equal(t, "aws.sqs", span.Meta[operationName]) assert.Equal(t, "InferredSpansQueueNode", span.Meta[resourceNames]) assert.Equal(t, "InferredSpansQueueNode", span.Meta[queueName]) - assert.Equal(t, "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", span.Meta[eventSourceArn]) + assert.Equal(t, "arn:aws:sqs:sa-east-1:425362996713:InferredSpansQueueNode", span.Meta[eventSourceArn]) assert.Equal(t, "AQEBnxFcyzQZhkrLV/TrSpn0VBszuq4a5/u66uyGRdUKuvXMurd6RRV952L+arORbE4MlGqWLUxurzYH9mKvc/A3MYjmGwQvvhp6uK5c7gXxg6tvHVAlsEFmTB0p35dxfGCmtrJbzdPjVtmcucPEpRx7z51tQokgGWuJbqx3Z9MVRD+6dyO3o6Zu6G3oWUgiUZ0dxhNoIIeT6xr/tEsoWhGK9ZUPRJ7e0BM/UZKfkecX1CVgVZ8J/t8fHRklJd34S6pN99SPNBKx+1lOZCelm2MihbQR6zax8bkhwL3glxYP83MxexvfOELA3G/6jx96oQ4mQdJASsKFUzvcs2NUxX+0bBVX9toS7MW/Udv+3CiQwSjjkc18A385QHtNrJDRbH33OUxFCqN5CcUMiGvEFed5EQ==", span.Meta[receiptHandle]) assert.Equal(t, "AROAYYB64AB3LSVUYFP5T:harv-inferred-spans-dev-initSender", span.Meta[senderID]) assert.True(t, inferredSpan.IsAsync) @@ -284,7 +284,7 @@ func TestEnrichInferredSpanWithKinesisEvent(t *testing.T) { assert.Equal(t, "stream/kinesisStream", span.Meta[resourceNames]) assert.Equal(t, "stream/kinesisStream", span.Meta[streamName]) assert.Equal(t, "shardId-000000000002", span.Meta[shardID]) - assert.Equal(t, "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream", span.Meta[eventSourceArn]) + assert.Equal(t, "arn:aws:kinesis:sa-east-1:425362996713:stream/kinesisStream", span.Meta[eventSourceArn]) assert.Equal(t, "shardId-000000000002:49624230154685806402418173680709770494154422022871973922", span.Meta[eventID]) assert.Equal(t, "aws:kinesis:record", span.Meta[eventName]) assert.Equal(t, "1.0", span.Meta[eventVersion]) diff --git a/pkg/serverless/trace/span_modifier.go b/pkg/serverless/trace/span_modifier.go index ba52baa853e14..c94d2f916efbd 100644 --- a/pkg/serverless/trace/span_modifier.go +++ b/pkg/serverless/trace/span_modifier.go @@ -16,8 +16,9 @@ const ( ) type spanModifier struct { - tags map[string]string - coldStartSpanCreator *ColdStartSpanCreator + tags map[string]string + lambdaSpanChan chan<- *pb.Span + coldStartSpanId uint64 } // Process applies extra logic to the given span @@ -27,10 +28,15 @@ func (s *spanModifier) ModifySpan(span *pb.Span) { if s.tags["service"] != "" { span.Service = s.tags["service"] } - if s.coldStartSpanCreator != nil { - s.coldStartSpanCreator.create(span) + if s.lambdaSpanChan != nil && span.Name != "aws.lambda.cold_start" { + s.lambdaSpanChan <- span } } + + if span.Name == "aws.lambda.load" { + span.ParentID = s.coldStartSpanId + } + if inferredspan.CheckIsInferredSpan(span) { log.Debug("Detected a managed service span, filtering out function tags") diff --git a/pkg/serverless/trace/testdata/event_samples/api-gateway-non-proxy-async.json b/pkg/serverless/trace/testdata/event_samples/api-gateway-non-proxy-async.json index 46ca9d9a686c9..27873d0926528 100644 --- a/pkg/serverless/trace/testdata/event_samples/api-gateway-non-proxy-async.json +++ b/pkg/serverless/trace/testdata/event_samples/api-gateway-non-proxy-async.json @@ -81,7 +81,7 @@ "extendedRequestId": "FaERiG1RGjQFb6g=", "requestTime": "09/Sep/2021:18:08:35 +0000", "path": "/dev/http/get", - "accountId": "601427279990", + "accountId": "425362996713", "protocol": "HTTP/1.1", "stage": "dev", "domainPrefix": "lgxbo6a518", diff --git a/pkg/serverless/trace/testdata/event_samples/api-gateway-non-proxy.json b/pkg/serverless/trace/testdata/event_samples/api-gateway-non-proxy.json index 500351a179c97..e829a373214f5 100644 --- a/pkg/serverless/trace/testdata/event_samples/api-gateway-non-proxy.json +++ b/pkg/serverless/trace/testdata/event_samples/api-gateway-non-proxy.json @@ -80,7 +80,7 @@ "extendedRequestId": "FaERiG1RGjQFb6g=", "requestTime": "09/Sep/2021:18:08:35 +0000", "path": "/dev/http/get", - "accountId": "601427279990", + "accountId": "425362996713", "protocol": "HTTP/1.1", "stage": "dev", "domainPrefix": "lgxbo6a518", diff --git a/pkg/serverless/trace/testdata/event_samples/eventbridge-custom.json b/pkg/serverless/trace/testdata/event_samples/eventbridge-custom.json index 456980f849878..96c11000600ae 100644 --- a/pkg/serverless/trace/testdata/event_samples/eventbridge-custom.json +++ b/pkg/serverless/trace/testdata/event_samples/eventbridge-custom.json @@ -3,7 +3,7 @@ "id": "fd03f394-e769-eff5-08a8-53c228933591", "detail-type": "testdetail", "source": "eventbridge.custom.event.sender", - "account": "601427279990", + "account": "425362996713", "time": "2021-11-04T01:37:45Z", "region": "sa-east-1", "resources": [], diff --git a/pkg/serverless/trace/testdata/event_samples/http-api.json b/pkg/serverless/trace/testdata/event_samples/http-api.json index 602e795bb3a24..061a02522d008 100644 --- a/pkg/serverless/trace/testdata/event_samples/http-api.json +++ b/pkg/serverless/trace/testdata/event_samples/http-api.json @@ -17,7 +17,7 @@ "x-datadog-sampling-priority": "2" }, "requestContext": { - "accountId": "601427279990", + "accountId": "425362996713", "apiId": "x02yirxc7a", "domainName": "x02yirxc7a.execute-api.sa-east-1.amazonaws.com", "domainPrefix": "x02yirxc7a", diff --git a/pkg/serverless/trace/testdata/event_samples/kinesis-batch.json b/pkg/serverless/trace/testdata/event_samples/kinesis-batch.json index e1d0833a9761d..0575cbf3873b3 100644 --- a/pkg/serverless/trace/testdata/event_samples/kinesis-batch.json +++ b/pkg/serverless/trace/testdata/event_samples/kinesis-batch.json @@ -12,9 +12,9 @@ "eventVersion": "1.0", "eventID": "shardId-000000000002:49624230154685806402418173680709770494154422022871973922", "eventName": "aws:kinesis:record", - "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-sa-east-1-lambdaRole", + "invokeIdentityArn": "arn:aws:iam::425362996713:role/inferred-spans-python-dev-sa-east-1-lambdaRole", "awsRegion": "sa-east-1", - "eventSourceARN": "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream" + "eventSourceARN": "arn:aws:kinesis:sa-east-1:425362996713:stream/kinesisStream" }, { "kinesis": { @@ -28,9 +28,9 @@ "eventVersion": "1.0", "eventID": "shardId-000000000002:49624230154685806402418173680709770494154422022871973922", "eventName": "aws:kinesis:record", - "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-sa-east-1-lambdaRole", + "invokeIdentityArn": "arn:aws:iam::425362996713:role/inferred-spans-python-dev-sa-east-1-lambdaRole", "awsRegion": "sa-east-1", - "eventSourceARN": "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream" + "eventSourceARN": "arn:aws:kinesis:sa-east-1:425362996713:stream/kinesisStream" } ] } diff --git a/pkg/serverless/trace/testdata/event_samples/kinesis.json b/pkg/serverless/trace/testdata/event_samples/kinesis.json index 7b9f444fb2685..b934ef90e22d8 100644 --- a/pkg/serverless/trace/testdata/event_samples/kinesis.json +++ b/pkg/serverless/trace/testdata/event_samples/kinesis.json @@ -12,9 +12,9 @@ "eventVersion": "1.0", "eventID": "shardId-000000000002:49624230154685806402418173680709770494154422022871973922", "eventName": "aws:kinesis:record", - "invokeIdentityArn": "arn:aws:iam::601427279990:role/inferred-spans-python-dev-sa-east-1-lambdaRole", + "invokeIdentityArn": "arn:aws:iam::425362996713:role/inferred-spans-python-dev-sa-east-1-lambdaRole", "awsRegion": "sa-east-1", - "eventSourceARN": "arn:aws:kinesis:sa-east-1:601427279990:stream/kinesisStream" + "eventSourceARN": "arn:aws:kinesis:sa-east-1:425362996713:stream/kinesisStream" } ] } diff --git a/pkg/serverless/trace/testdata/event_samples/sns-batch.json b/pkg/serverless/trace/testdata/event_samples/sns-batch.json index c84da29776570..6e5d93e788e9a 100644 --- a/pkg/serverless/trace/testdata/event_samples/sns-batch.json +++ b/pkg/serverless/trace/testdata/event_samples/sns-batch.json @@ -3,18 +3,18 @@ { "EventSource": "aws:sns", "EventVersion": "1.0", - "EventSubscriptionArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "EventSubscriptionArn": "arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "Sns": { "Type": "Notification", "MessageId": "87056a47-f506-5d77-908b-303605d3b197", - "TopicArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "TopicArn": "arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy", "Subject": null, "Message": "Asynchronously invoking a Lambda function with SNS.", "Timestamp": "2022-01-31T14:13:41.637Z", "SignatureVersion": "1", "Signature": "BmwnJb0Ku2KgQef9QOgaSSTwLyUsbkRq90lzD5Vn4mAcRUOq2ForfMOYbxMB6idljWIWy9t/jK4AIMxPGk/eOGiRcENx3BvAcGcoDayBRFY13+xUGaPn5Lfoht/ZJ7/hmCgFWKRa8ooATZL+AwGAw6Id8qzf0R3M3k2asy5Vxa4ODKiFW9OzWY/zFgsYJhddR3JrQl9YOMRyIobNNHT96o1TwjGsSUTEemrxA6jQtb3QbardEKO+2SuataLEZki7gE2D2sA300WqZecumI339q7la+OIj6VDGDwFoppE2sh8hzJYXAH7oo11giwltE0V3/eLFCVhsE8Y1KD/yDPPsA==", "SigningCertUrl": "https://sns.sa-east-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", - "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "MessageAttributes": { "_datadog": { "Type": "String", @@ -26,18 +26,18 @@ { "EventSource": "aws:sns", "EventVersion": "1.0", - "EventSubscriptionArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "EventSubscriptionArn": "arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "Sns": { "Type": "Notification", "MessageId": "87056a47-f506-5d77-908b-303605d3b197", - "TopicArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "TopicArn": "arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy", "Subject": null, "Message": "Asynchronously invoking a Lambda function with SNS.", "Timestamp": "2022-01-31T14:13:41.637Z", "SignatureVersion": "1", "Signature": "BmwnJb0Ku2KgQef9QOgaSSTwLyUsbkRq90lzD5Vn4mAcRUOq2ForfMOYbxMB6idljWIWy9t/jK4AIMxPGk/eOGiRcENx3BvAcGcoDayBRFY13+xUGaPn5Lfoht/ZJ7/hmCgFWKRa8ooATZL+AwGAw6Id8qzf0R3M3k2asy5Vxa4ODKiFW9OzWY/zFgsYJhddR3JrQl9YOMRyIobNNHT96o1TwjGsSUTEemrxA6jQtb3QbardEKO+2SuataLEZki7gE2D2sA300WqZecumI339q7la+OIj6VDGDwFoppE2sh8hzJYXAH7oo11giwltE0V3/eLFCVhsE8Y1KD/yDPPsA==", "SigningCertUrl": "https://sns.sa-east-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", - "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "MessageAttributes": { "_datadog": { "Type": "String", diff --git a/pkg/serverless/trace/testdata/event_samples/sns.json b/pkg/serverless/trace/testdata/event_samples/sns.json index b58f6a1ca57e1..87888ca909435 100644 --- a/pkg/serverless/trace/testdata/event_samples/sns.json +++ b/pkg/serverless/trace/testdata/event_samples/sns.json @@ -3,18 +3,18 @@ { "EventSource": "aws:sns", "EventVersion": "1.0", - "EventSubscriptionArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "EventSubscriptionArn": "arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "Sns": { "Type": "Notification", "MessageId": "87056a47-f506-5d77-908b-303605d3b197", - "TopicArn": "arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy", + "TopicArn": "arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy", "Subject": "Hello", "Message": "Asynchronously invoking a Lambda function with SNS.", "Timestamp": "2022-01-31T14:13:41.637Z", "SignatureVersion": "1", "Signature": "BmwnJb0Ku2KgQef9QOgaSSTwLyUsbkRq90lzD5Vn4mAcRUOq2ForfMOYbxMB6idljWIWy9t/jK4AIMxPGk/eOGiRcENx3BvAcGcoDayBRFY13+xUGaPn5Lfoht/ZJ7/hmCgFWKRa8ooATZL+AwGAw6Id8qzf0R3M3k2asy5Vxa4ODKiFW9OzWY/zFgsYJhddR3JrQl9YOMRyIobNNHT96o1TwjGsSUTEemrxA6jQtb3QbardEKO+2SuataLEZki7gE2D2sA300WqZecumI339q7la+OIj6VDGDwFoppE2sh8hzJYXAH7oo11giwltE0V3/eLFCVhsE8Y1KD/yDPPsA==", "SigningCertUrl": "https://sns.sa-east-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem", - "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:601427279990:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", + "UnsubscribeUrl": "https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:425362996713:serverlessTracingTopicPy:224b60ba-befc-4830-ad96-f1f0ac94eb04", "MessageAttributes": { "_datadog": { "Type": "String", diff --git a/pkg/serverless/trace/testdata/event_samples/snssqs.json b/pkg/serverless/trace/testdata/event_samples/snssqs.json index 1fd0f1592c353..1e2f645a35e31 100644 --- a/pkg/serverless/trace/testdata/event_samples/snssqs.json +++ b/pkg/serverless/trace/testdata/event_samples/snssqs.json @@ -3,7 +3,7 @@ { "messageId": "64812b68-4d9b-4dca-b3fb-9b18f255ee51", "receiptHandle": "AQEBER6aRkfG8092GvkL7FRwCwbQ7LLDW9Tlk/CembqHe+suS2kfFxXiukomvaIN61QoyQMoRgWuV52SDkiQno2u+5hP64BDbmw+e/KR9ayvIfHJ3M6RfyQLaWNWm3hDFBCKTnBMVIxtdx0N9epZZewyokjKcrNYtmCghFgTCvZzsQkowi5rnoHAVHJ3je1c3bDnQ1KLrZFgajDnootYXDwEPuMq5FIxrf4EzTe0S7S+rnRm+GaQfeBLBVAY6dASL9usV3/AFRqDtaI7GKI+0F2NCgLlqj49VlPRz4ldhkGknYlKTZTluAqALWLJS62/J1GQo53Cs3nneJcmu5ajB2zzmhhRXoXINEkLhCD5ujZfcsw9H4xqW69Or4ECvlqx14bUU2rtMIW0QM2p7pEeXnyocymQv6m1te113eYWTVmaJ4I=", - "body": "{\n \"Type\" : \"Notification\",\n \"MessageId\" : \"0a0ab23e-4861-5447-82b7-e8094ff3e332\",\n \"TopicArn\" : \"arn:aws:sns:sa-east-1:601427279990:js-library-test-dev-demoTopic-15WGUVRCBMPAA\",\n \"Message\" : \"{\\\"hello\\\":\\\"harv\\\",\\\"nice of you to join us\\\":\\\"david\\\",\\\"anotherThing\\\":{\\\"foo\\\":\\\"bar\\\",\\\"blah\\\":null,\\\"harv\\\":123},\\\"vals\\\":[{\\\"thingOne\\\":1},{\\\"thingTwo\\\":2}],\\\"ajTimestamp\\\":1639777617957}\",\n \"Timestamp\" : \"2021-12-17T21:46:58.040Z\",\n \"SignatureVersion\" : \"1\",\n \"Signature\" : \"FR35/7E8C3LHEVk/rC4XxXlXwV/5mNkFNPgDhHSnJ2I6hIoSrTROAm7h5xm1PuBkAeFDvq0zofw91ouk9zZyvhdrMLFIIgrjEyNayRmEffmoEAkzLFUsgtQX7MmTl644r4NuWiM0Oiz7jueRvIcKXcZr7Nc6GJcWV1ymec8oOmuHNMisnPMxI07LIQVYSyAfv6P9r2jEWMVIukRoCzwTnRk4bUUYhPSGHI7OC3AsxxXBbv8snqTrLM/4z2rXCf6jHCKNxWeLlm9/45PphCkEyx5BWS4/71KaoMWUWy8+6CCsy+uF3XTCVmvSEYLyEwTSzOY+vCUjazrRW93498i70g==\",\n \"SigningCertURL\" : \"https://sns.sa-east-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem\",\n \"UnsubscribeURL\" : \"https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:601427279990:js-library-test-dev-demoTopic-15WGUVRCBMPAA:1290f550-9a8a-4e8f-a900-8f5f96dcddda\",\n \"MessageAttributes\" : {\n \"_datadog\" : {\"Type\":\"String\",\"Value\":\"{\\\"x-datadog-trace-id\\\":\\\"2776434475358637757\\\",\\\"x-datadog-parent-id\\\":\\\"4493917105238181843\\\",\\\"x-datadog-sampled\\\":\\\"1\\\",\\\"x-datadog-sampling-priority\\\":\\\"1\\\"}\"}\n }\n}", + "body": "{\n \"Type\" : \"Notification\",\n \"MessageId\" : \"0a0ab23e-4861-5447-82b7-e8094ff3e332\",\n \"TopicArn\" : \"arn:aws:sns:sa-east-1:425362996713:js-library-test-dev-demoTopic-15WGUVRCBMPAA\",\n \"Message\" : \"{\\\"hello\\\":\\\"harv\\\",\\\"nice of you to join us\\\":\\\"david\\\",\\\"anotherThing\\\":{\\\"foo\\\":\\\"bar\\\",\\\"blah\\\":null,\\\"harv\\\":123},\\\"vals\\\":[{\\\"thingOne\\\":1},{\\\"thingTwo\\\":2}],\\\"ajTimestamp\\\":1639777617957}\",\n \"Timestamp\" : \"2021-12-17T21:46:58.040Z\",\n \"SignatureVersion\" : \"1\",\n \"Signature\" : \"FR35/7E8C3LHEVk/rC4XxXlXwV/5mNkFNPgDhHSnJ2I6hIoSrTROAm7h5xm1PuBkAeFDvq0zofw91ouk9zZyvhdrMLFIIgrjEyNayRmEffmoEAkzLFUsgtQX7MmTl644r4NuWiM0Oiz7jueRvIcKXcZr7Nc6GJcWV1ymec8oOmuHNMisnPMxI07LIQVYSyAfv6P9r2jEWMVIukRoCzwTnRk4bUUYhPSGHI7OC3AsxxXBbv8snqTrLM/4z2rXCf6jHCKNxWeLlm9/45PphCkEyx5BWS4/71KaoMWUWy8+6CCsy+uF3XTCVmvSEYLyEwTSzOY+vCUjazrRW93498i70g==\",\n \"SigningCertURL\" : \"https://sns.sa-east-1.amazonaws.com/SimpleNotificationService-7ff5318490ec183fbaddaa2a969abfda.pem\",\n \"UnsubscribeURL\" : \"https://sns.sa-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:sa-east-1:425362996713:js-library-test-dev-demoTopic-15WGUVRCBMPAA:1290f550-9a8a-4e8f-a900-8f5f96dcddda\",\n \"MessageAttributes\" : {\n \"_datadog\" : {\"Type\":\"String\",\"Value\":\"{\\\"x-datadog-trace-id\\\":\\\"2776434475358637757\\\",\\\"x-datadog-parent-id\\\":\\\"4493917105238181843\\\",\\\"x-datadog-sampled\\\":\\\"1\\\",\\\"x-datadog-sampling-priority\\\":\\\"1\\\"}\"}\n }\n}", "attributes": { "ApproximateReceiveCount": "1", "SentTimestamp": "1639777618130", @@ -13,7 +13,7 @@ "messageAttributes": {}, "md5OfBody": "ee19d8b1377919239ad3fd5dabc33739", "eventSource": "aws:sqs", - "eventSourceARN": "arn:aws:sqs:sa-east-1:601427279990:aj-js-library-test-dev-demo-queue", + "eventSourceARN": "arn:aws:sqs:sa-east-1:425362996713:aj-js-library-test-dev-demo-queue", "awsRegion": "sa-east-1" } ] diff --git a/pkg/serverless/trace/testdata/event_samples/sqs-batch.json b/pkg/serverless/trace/testdata/event_samples/sqs-batch.json index d3687dcfdb3cf..032bae3ee65ac 100644 --- a/pkg/serverless/trace/testdata/event_samples/sqs-batch.json +++ b/pkg/serverless/trace/testdata/event_samples/sqs-batch.json @@ -21,7 +21,7 @@ "md5OfMessageAttributes": "14b3b4a81d5ddeb96af62963d703c528", "md5OfBody": "24933a8beabe72088d7576cab1a59142", "eventSource": "aws:sqs", - "eventSourceARN": "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", + "eventSourceARN": "arn:aws:sqs:sa-east-1:425362996713:InferredSpansQueueNode", "awsRegion": "sa-east-1" }, { @@ -45,7 +45,7 @@ "md5OfMessageAttributes": "14b3b4a81d5ddeb96af62963d703c528", "md5OfBody": "24933a8beabe72088d7576cab1a59142", "eventSource": "aws:sqs", - "eventSourceARN": "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", + "eventSourceARN": "arn:aws:sqs:sa-east-1:425362996713:InferredSpansQueueNode", "awsRegion": "sa-east-1" } ] diff --git a/pkg/serverless/trace/testdata/event_samples/sqs.json b/pkg/serverless/trace/testdata/event_samples/sqs.json index c182704be8e07..fa7fbc86dc001 100644 --- a/pkg/serverless/trace/testdata/event_samples/sqs.json +++ b/pkg/serverless/trace/testdata/event_samples/sqs.json @@ -21,7 +21,7 @@ "md5OfMessageAttributes": "14b3b4a81d5ddeb96af62963d703c528", "md5OfBody": "24933a8beabe72088d7576cab1a59142", "eventSource": "aws:sqs", - "eventSourceARN": "arn:aws:sqs:sa-east-1:601427279990:InferredSpansQueueNode", + "eventSourceARN": "arn:aws:sqs:sa-east-1:425362996713:InferredSpansQueueNode", "awsRegion": "sa-east-1" } ] diff --git a/pkg/serverless/trace/trace.go b/pkg/serverless/trace/trace.go index 83564eb9feb1c..036397aa8863e 100644 --- a/pkg/serverless/trace/trace.go +++ b/pkg/serverless/trace/trace.go @@ -8,11 +8,9 @@ package trace import ( "context" "strings" - "sync" tracecmdconfig "github.com/DataDog/datadog-agent/cmd/trace-agent/config" ddConfig "github.com/DataDog/datadog-agent/pkg/config" - "github.com/DataDog/datadog-agent/pkg/serverless/executioncontext" "github.com/DataDog/datadog-agent/pkg/trace/agent" "github.com/DataDog/datadog-agent/pkg/trace/config" "github.com/DataDog/datadog-agent/pkg/trace/pb" @@ -56,7 +54,7 @@ func (l *LoadConfig) Load() (*config.AgentConfig, error) { } // Start starts the agent -func (s *ServerlessTraceAgent) Start(enabled bool, loadConfig Load, executionContext *executioncontext.ExecutionContext) { +func (s *ServerlessTraceAgent) Start(enabled bool, loadConfig Load, lambdaSpanChan chan<- *pb.Span, coldStartSpanId uint64) { if enabled { // Set the serverless config option which will be used to determine if // hostname should be resolved. Skipping hostname resolution saves >1s @@ -71,13 +69,9 @@ func (s *ServerlessTraceAgent) Start(enabled bool, loadConfig Load, executionCon tc.Hostname = "" tc.SynchronousFlushing = true s.ta = agent.NewAgent(context, tc) - s.spanModifier = &spanModifier{} - if executionContext != nil { - s.spanModifier.coldStartSpanCreator = &ColdStartSpanCreator{ - executionContext: executionContext, - traceAgent: s, - createSpan: &sync.Once{}, - } + s.spanModifier = &spanModifier{ + coldStartSpanId: coldStartSpanId, + lambdaSpanChan: lambdaSpanChan, } s.ta.ModifySpan = s.spanModifier.ModifySpan diff --git a/pkg/serverless/trace/trace_test.go b/pkg/serverless/trace/trace_test.go index f64bbe7bcfdd3..6d0ea8ac50b35 100644 --- a/pkg/serverless/trace/trace_test.go +++ b/pkg/serverless/trace/trace_test.go @@ -15,13 +15,15 @@ import ( "github.com/stretchr/testify/assert" + "github.com/DataDog/datadog-agent/pkg/serverless/random" "github.com/DataDog/datadog-agent/pkg/trace/config" "github.com/DataDog/datadog-agent/pkg/trace/pb" ) func TestStartEnabledFalse(t *testing.T) { + lambdaSpanChan := make(chan *pb.Span) var agent = &ServerlessTraceAgent{} - agent.Start(false, nil, nil) + agent.Start(false, nil, lambdaSpanChan, random.Random.Uint64()) defer agent.Stop() assert.Nil(t, agent.ta) assert.Nil(t, agent.Get()) @@ -38,7 +40,8 @@ func (l *LoadConfigMocked) Load() (*config.AgentConfig, error) { func TestStartEnabledTrueInvalidConfig(t *testing.T) { var agent = &ServerlessTraceAgent{} - agent.Start(true, &LoadConfigMocked{}, nil) + lambdaSpanChan := make(chan *pb.Span) + agent.Start(true, &LoadConfigMocked{}, lambdaSpanChan, random.Random.Uint64()) defer agent.Stop() assert.Nil(t, agent.ta) assert.Nil(t, agent.Get()) @@ -47,9 +50,10 @@ func TestStartEnabledTrueInvalidConfig(t *testing.T) { func TestStartEnabledTrueValidConfigUnvalidPath(t *testing.T) { var agent = &ServerlessTraceAgent{} + lambdaSpanChan := make(chan *pb.Span) t.Setenv("DD_API_KEY", "x") - agent.Start(true, &LoadConfig{Path: "invalid.yml"}, nil) + agent.Start(true, &LoadConfig{Path: "invalid.yml"}, lambdaSpanChan, random.Random.Uint64()) defer agent.Stop() assert.NotNil(t, agent.ta) assert.NotNil(t, agent.Get()) @@ -58,8 +62,9 @@ func TestStartEnabledTrueValidConfigUnvalidPath(t *testing.T) { func TestStartEnabledTrueValidConfigValidPath(t *testing.T) { var agent = &ServerlessTraceAgent{} + lambdaSpanChan := make(chan *pb.Span) - agent.Start(true, &LoadConfig{Path: "./testdata/valid.yml"}, nil) + agent.Start(true, &LoadConfig{Path: "./testdata/valid.yml"}, lambdaSpanChan, random.Random.Uint64()) defer agent.Stop() assert.NotNil(t, agent.ta) assert.NotNil(t, agent.Get()) @@ -68,8 +73,10 @@ func TestStartEnabledTrueValidConfigValidPath(t *testing.T) { func TestLoadConfigShouldBeFast(t *testing.T) { startTime := time.Now() + lambdaSpanChan := make(chan *pb.Span) + agent := &ServerlessTraceAgent{} - agent.Start(true, &LoadConfig{Path: "./testdata/valid.yml"}, nil) + agent.Start(true, &LoadConfig{Path: "./testdata/valid.yml"}, lambdaSpanChan, random.Random.Uint64()) defer agent.Stop() assert.True(t, time.Since(startTime) < time.Second) } diff --git a/pkg/serverless/trigger/testData/eventbridge-custom.json b/pkg/serverless/trigger/testData/eventbridge-custom.json index 456980f849878..96c11000600ae 100644 --- a/pkg/serverless/trigger/testData/eventbridge-custom.json +++ b/pkg/serverless/trigger/testData/eventbridge-custom.json @@ -3,7 +3,7 @@ "id": "fd03f394-e769-eff5-08a8-53c228933591", "detail-type": "testdetail", "source": "eventbridge.custom.event.sender", - "account": "601427279990", + "account": "425362996713", "time": "2021-11-04T01:37:45Z", "region": "sa-east-1", "resources": [], diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py new file mode 100644 index 0000000000000..c018983ad9130 --- /dev/null +++ b/test/integration/serverless/log_normalize.py @@ -0,0 +1,188 @@ +import argparse +import json +import re + + +def normalize_metrics(stage): + return [ + replace(r'raise Exception', r'\n'), + require(r'BEGINMETRIC.*ENDMETRIC'), + exclude(r'BEGINMETRIC'), + exclude(r'ENDMETRIC'), + replace(r'(ts":)[0-9]{10}', r'\1XXX'), + replace(r'(min":)[0-9\.e\-]{1,30}', r'\1XXX'), + replace(r'(max":)[0-9\.e\-]{1,30}', r'\1XXX'), + replace(r'(cnt":)[0-9\.e\-]{1,30}', r'\1XXX'), + replace(r'(avg":)[0-9\.e\-]{1,30}', r'\1XXX'), + replace(r'(sum":)[0-9\.e\-]{1,30}', r'\1XXX'), + replace(r'(k":\[)[0-9\.e\-]{1,30}', r'\1XXX'), + replace(r'(datadog-nodev)[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'), + replace(r'(datadog_lambda:v)[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'), + replace(r'dd_lambda_layer:datadog-go[0-9.]{1,}', r'dd_lambda_layer:datadog-gox.x.x'), + replace(r'(dd_lambda_layer:datadog-python)[0-9_]+\.[0-9]+\.[0-9]+', r'\1X.X.X'), + replace(r'(serverless.lambda-extension.integration-test.count)[0-9\.]+', r'\1'), + replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'), + replace(stage, 'XXXXXX'), + exclude(r'[ ]$'), + sort_by(lambda log: (log["metric"], "cold_start:true" in log["tags"])), + ] + + +def normalize_logs(stage): + return [ + require(r'BEGINLOG.*ENDLOG'), + exclude(r'BEGINLOG'), + exclude(r'ENDLOG'), + replace(r'("timestamp":\s*?)\d{13}', r'\1"XXX"'), + replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}:\d{3}', 'TIMESTAMP'), + replace(r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z', 'TIMESTAMP'), + replace(r'\d{4}\/\d{2}\/\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'), + replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'), + replace(r'([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12})', r'XXX'), + replace(stage, 'XXXXXX'), + replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'), + sort_by(lambda log: log["message"]["message"]), + # TODO: these messages may be an indication of a real problem and + # should be investigated + rm_item( + lambda log: log["message"]["message"] + in ( + "TIMESTAMP UTC | DD_EXTENSION | ERROR | could not forward the request context canceled\n", + "TIMESTAMP http: proxy error: context canceled\n", + ) + ), + ] + + +def normalize_traces(stage): + return [ + require(r'BEGINTRACE.*ENDTRACE'), + exclude(r'BEGINTRACE'), + exclude(r'ENDTRACE'), + replace(r'(ts":)[0-9]{10}', r'\1XXX'), + replace(r'((startTime|endTime|traceID|trace_id|span_id|parent_id|start|system.pid)":)[0-9]+', r'\1null'), + replace(r'((tracer_version|language_version)":)["a-zA-Z0-9~\-\.\_]+', r'\1null'), + replace(r'(duration":)[0-9]+', r'\1null'), + replace(r'((datadog_lambda|dd_trace)":")[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'), + replace(r'(,"request_id":")[a-zA-Z0-9\-,]+"', r'\1null"'), + replace(r'(,"runtime-id":")[a-zA-Z0-9\-,]+"', r'\1null"'), + replace(r'(,"system.pid":")[a-zA-Z0-9\-,]+"', r'\1null"'), + replace(r'("_dd.no_p_sr":)[0-9\.]+', r'\1null'), + replace(r'("architecture":)"(x86_64|arm64)"', r'\1"XXX"'), + replace(r'("process_id":)[0-9]+', r'\1null'), + replace(stage, 'XXXXXX'), + exclude(r'[ ]$'), + ] + + +##################### +# BEGIN NORMALIZERS # +##################### + + +def replace(pattern, repl): + """ + Replace all substrings matching regex pattern with given replacement string + """ + comp = re.compile(pattern, flags=re.DOTALL) + + def _replace(log): + return comp.sub(repl, log) + + return _replace + + +def exclude(pattern): + """ + Remove all substrings matching regex pattern + """ + return replace(pattern, '') + + +def require(pattern): + """ + Remove all substrings that don't match the given regex pattern + """ + comp = re.compile(pattern, flags=re.DOTALL) + + def _require(log): + match = comp.search(log) + if not match: + return '' + return match.group(0) + + return _require + + +def sort_by(key): + """ + Sort the json entries using the given key function, requires the log string + to be proper json and to be a list + """ + + def _sort(log): + log_json = json.loads(log, strict=False) + log_sorted = sorted(log_json, key=key) + return json.dumps(log_sorted) + + return _sort + + +def rm_item(key): + """ + Delete json entries from the log string using the given key function, key + takes an item from the json list and must return boolean which is True when + the item is to be removed and False if it is to be kept + """ + + def _rm_item(log): + log_json = json.loads(log, strict=False) + new_logs = [i for i in log_json if not key(i)] + return json.dumps(new_logs) + + return _rm_item + + +################### +# END NORMALIZERS # +################### + + +def normalize(log, typ, stage): + for normalizer in get_normalizers(typ, stage): + log = normalizer(log) + return format_json(log) + + +def get_normalizers(typ, stage): + if typ == 'metrics': + return normalize_metrics(stage) + elif typ == 'logs': + return normalize_logs(stage) + elif typ == 'traces': + return normalize_traces(stage) + else: + raise ValueError(f'invalid type "{typ}"') + + +def format_json(log): + return json.dumps(json.loads(log, strict=False), indent=2) + + +def parse_args(): + parser = argparse.ArgumentParser() + parser.add_argument('--type', required=True) + parser.add_argument('--logs', required=True) + parser.add_argument('--stage', required=True) + return parser.parse_args() + + +if __name__ == '__main__': + try: + args = parse_args() + print(normalize(args.logs, args.type, args.stage)) + except Exception: + err = {"error": "normalization raised exception"} + err_json = json.dumps(err, indent=2) + print(err_json) + exit(1) diff --git a/test/integration/serverless/parse-json.js b/test/integration/serverless/parse-json.js deleted file mode 100644 index 8f7651144e1dd..0000000000000 --- a/test/integration/serverless/parse-json.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict' - -var readline = require('readline'); -var rl = readline.createInterface({ - input: process.stdin, - output: process.stdout, - terminal: false -}); - -rl.on('line', function(line){ - try { - const obj = JSON.parse(line) - console.log(JSON.stringify(obj, null, 2)) - } catch (e) { - console.log(line) - } -}) \ No newline at end of file diff --git a/test/integration/serverless/run.sh b/test/integration/serverless/run.sh index e420136d27534..fe56a88035048 100755 --- a/test/integration/serverless/run.sh +++ b/test/integration/serverless/run.sh @@ -154,20 +154,7 @@ all_functions=("${metric_functions[@]}" "${log_functions[@]}" "${trace_functions # Add a function to this list to skip checking its results # This should only be used temporarily while we investigate and fix the test -functions_to_skip=( - # Tagging behavior after a timeout is currently known to be flaky - "timeout-node" - "timeout-python" - "timeout-java" - "timeout-go" - "timeout-csharp" - "timeout-proxy" - "trace-csharp" # Will be reactivated when the new dotnet layer will be released - "trace-proxy" # Will be reactivated when sampling with proxy will be implemented - "error-proxy" - "log-proxy" - "metric-proxy" -) +functions_to_skip=() echo "Invoking functions for the first time..." set +e # Don't exit this script if an invocation fails or there's a diff @@ -215,95 +202,22 @@ for function_name in "${all_functions[@]}"; do # Replace invocation-specific data like timestamps and IDs with XXX to normalize across executions if [[ " ${metric_functions[*]} " =~ " ${function_name} " ]]; then - # Normalize metrics - logs=$( - echo "$raw_logs" | - perl -p -e "s/raise Exception/\n/g" | - grep -v "BEGINLOG.*" | - grep -v "BEGINTRACE.*" | - grep "BEGINMETRIC.*" | - perl -p -e "s/BEGINMETRIC/\1/g" | - perl -p -e "s/ENDMETRIC/\1/g" | - perl -p -e "s/(ts\":)[0-9]{10}/\1XXX/g" | - perl -p -e "s/(min\":)[0-9\.e\-]{1,30}/\1XXX/g" | - perl -p -e "s/(max\":)[0-9\.e\-]{1,30}/\1XXX/g" | - perl -p -e "s/(cnt\":)[0-9\.e\-]{1,30}/\1XXX/g" | - perl -p -e "s/(avg\":)[0-9\.e\-]{1,30}/\1XXX/g" | - perl -p -e "s/(sum\":)[0-9\.e\-]{1,30}/\1XXX/g" | - perl -p -e "s/(k\":\[)[0-9\.e\-]{1,30}/\1XXX/g" | - perl -p -e "s/(datadog-nodev)[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" | - perl -p -e "s/(datadog_lambda:v)[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" | - perl -p -e "s/dd_lambda_layer:datadog-go[0-9.]{1,}/dd_lambda_layer:datadog-gox.x.x/g" | - perl -p -e "s/(dd_lambda_layer:datadog-python)[0-9_]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" | - perl -p -e "s/(serverless.lambda-extension.integration-test.count)[0-9\.]+/\1/g" | - perl -p -e "s/(architecture:)(x86_64|arm64)/\1XXX/g" | - perl -p -e "s/$stage/XXXXXX/g" | - perl -p -e "s/[ ]$//g" | - node parse-json.js - ) + norm_type=metrics elif [[ " ${log_functions[*]} " =~ " ${function_name} " ]]; then - # Normalize logs - logs=$( - echo "$raw_logs" | - grep "BEGINLOG" | - grep -v "BEGINMETRIC.*" | - grep -v "BEGINTRACE.*" | - perl -p -e "s/BEGINLOG/\1/g" | - perl -p -e "s/ENDLOG/\1/g" | - perl -p -e "s/(\"timestamp\": )\d{13}/\1\"XXX\"/g" | - perl -p -e "s/(\"timestamp\": )\d{13}/\1\"XXX\"/g" | - perl -p -e "s/\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}:\d{3}/TIMESTAMP/g" | - perl -p -e "s/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z/TIMESTAMP/g" | - perl -p -e "s/\d{4}\/\d{2}\/\d{2}\s\d{2}:\d{2}:\d{2}/TIMESTAMP/g" | - perl -p -e "s/\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}/TIMESTAMP/g" | - perl -p -e "s/\"timestamp\":\d{13},/\1/g" | - perl -p -e "s/([a-zA-Z0-9]{8}\-[a-zA-Z0-9]{4}\-[a-zA-Z0-9]{4}\-[a-zA-Z0-9]{4}\-[a-zA-Z0-9]{12})/\0\XXX/g" | - perl -p -e "s/$stage/STAGE/g" | - perl -p -e "s/(architecture:)(x86_64|arm64)/\1XXX/g" | - # ignore a Lambda error that occurs sporadically for log-csharp - # see here for more info: https://repost.aws/questions/QUq2OfIFUNTCyCKsChfJLr5w/lambda-function-working-locally-but-crashing-on-aws - perl -n -e "print unless /LAMBDA_RUNTIME Failed to get next invocation. No Response from endpoint/ or \ - /An error occurred while attempting to execute your code.: LambdaException/ or \ - /terminate called after throwing an instance of 'std::logic_error'/ or \ - /basic_string::_M_construct null not valid/" | - node parse-json.js - ) + norm_type=logs else - # Normalize traces - logs=$( - echo "$raw_logs" | - grep "BEGINTRACE" | - grep -v "BEGINMETRIC.*" | - grep -v "BEGINLOG.*" | - perl -p -e "s/BEGINTRACE/\1/g" | - perl -p -e "s/ENDTRACE/\1/g" | - perl -p -e "s/(ts\":)[0-9]{10}/\1XXX/g" | - perl -p -e "s/((startTime|endTime|traceID|trace_id|span_id|parent_id|start|system.pid)\":)[0-9]+/\1null/g" | - perl -p -e "s/((tracer_version|language_version)\":)[\"a-zA-Z0-9~\-\.\_]+/\1null/g" | - perl -p -e "s/(duration\":)[0-9]+/\1null/g" | - perl -p -e "s/((datadog_lambda|dd_trace)\":\")[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" | - perl -p -e "s/(,\"request_id\":\")[a-zA-Z0-9\-,]+\"/\1null\"/g" | - perl -p -e "s/(,\"runtime-id\":\")[a-zA-Z0-9\-,]+\"/\1null\"/g" | - perl -p -e "s/(,\"system.pid\":\")[a-zA-Z0-9\-,]+\"/\1null\"/g" | - perl -p -e "s/(\"_dd.no_p_sr\":)[0-9\.]+/\1null/g" | - perl -p -e "s/(\"architecture\":)\"(x86_64|arm64)\"/\1\"XXX\"/g" | - perl -p -e "s/(\"process_id\":)[0-9]+/\1null/g" | - perl -p -e "s/$stage/XXXXXX/g" | - perl -p -e "s/[ ]$//g" | - node parse-json.js - ) + norm_type=traces fi + logs=$(python3 log_normalize.py --type $norm_type --logs "$raw_logs" --stage $stage) function_snapshot_path="./snapshots/${function_name}" - jsonLogs="$(echo $logs | node parse-json.js)" - if [ ! -f "$function_snapshot_path" ]; then printf "${MAGENTA} CREATE ${END_COLOR} $function_name\n" - echo "$jsonLogs" >"$function_snapshot_path" + echo "$logs" >"$function_snapshot_path" elif [ "$UPDATE_SNAPSHOTS" == "true" ]; then printf "${MAGENTA} UPDATE ${END_COLOR} $function_name\n" - echo "$jsonLogs" > "$function_snapshot_path" + echo "$logs" > "$function_snapshot_path" else if [[ " ${functions_to_skip[*]} " =~ " ${function_name} " ]]; then printf "${YELLOW} SKIP ${END_COLOR} $function_name\n" @@ -314,7 +228,7 @@ for function_name in "${all_functions[@]}"; do printf "${YELLOW} SKIP ${END_COLOR} $function_name, no .NET support on arm64\n" continue fi - diff_output=$(echo "$jsonLogs" | diff - "$function_snapshot_path") + diff_output=$(echo "$logs" | diff - "$function_snapshot_path") if [ $? -eq 1 ]; then failed_functions+=("$function_name") diff --git a/test/integration/serverless/serverless.yml b/test/integration/serverless/serverless.yml index 407353b9537f8..073566b8a097f 100644 --- a/test/integration/serverless/serverless.yml +++ b/test/integration/serverless/serverless.yml @@ -28,10 +28,10 @@ provider: DD_CAPTURE_LAMBDA_PAYLOAD: true timeout: 15 deploymentBucket: - name: integration-tests-deployment-bucket-lambda-extension + name: integration-tests-serververless-deployment-bucket iam: # IAM permissions require that all functions are deployed with this role - role: "arn:aws:iam::601427279990:role/serverless-integration-test-lambda-role" + role: "arn:aws:iam::425362996713:role/serverless-integration-test-lambda-role" architecture: ${self:custom.altArchitectureNames.${env:ARCHITECTURE}} package: diff --git a/test/integration/serverless/snapshots/appsec-csharp b/test/integration/serverless/snapshots/appsec-csharp index d219b5d19c214..23ac018c743a9 100644 --- a/test/integration/serverless/snapshots/appsec-csharp +++ b/test/integration/serverless/snapshots/appsec-csharp @@ -22,13 +22,13 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "component": "WebRequest", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-csharp", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-csharp", "functionname": "integration-tests-extension-XXXXXX-appsec-csharp", "http.method": "GET", "http.status_code": "200", @@ -88,13 +88,13 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "component": "WebRequest", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-csharp", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-csharp", "functionname": "integration-tests-extension-XXXXXX-appsec-csharp", "http.method": "GET", "http.status_code": "200", diff --git a/test/integration/serverless/snapshots/appsec-java b/test/integration/serverless/snapshots/appsec-java index cf9d0846236ff..940c6dab1602e 100644 --- a/test/integration/serverless/snapshots/appsec-java +++ b/test/integration/serverless/snapshots/appsec-java @@ -22,12 +22,12 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-java", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-java", "functionname": "integration-tests-extension-XXXXXX-appsec-java", "memorysize": "1024", "region": "eu-west-1", @@ -78,14 +78,14 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "cold_start": "true", "datadog_lambda": "X.X.X", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-java", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-java", "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-appsec-java", "language": "jvm", @@ -147,14 +147,14 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "cold_start": "false", "datadog_lambda": "X.X.X", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-java", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-java", "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-appsec-java", "language": "jvm", diff --git a/test/integration/serverless/snapshots/error-csharp b/test/integration/serverless/snapshots/error-csharp index 42abc8e2022c2..c44db211768b3 100644 --- a/test/integration/serverless/snapshots/error-csharp +++ b/test/integration/serverless/snapshots/error-csharp @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -103,12 +103,12 @@ "metric": "aws.lambda.enhanced.errors", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -127,12 +127,12 @@ "metric": "aws.lambda.enhanced.errors", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -151,13 +151,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -176,13 +176,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -201,13 +201,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -226,13 +226,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "init_type:on-demand", "memorysize:1024", @@ -252,13 +252,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "init_type:on-demand", "memorysize:1024", @@ -278,13 +278,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -303,13 +303,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -328,13 +328,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -353,13 +353,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -378,13 +378,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -403,13 +403,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -428,13 +428,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -453,13 +453,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -478,13 +478,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -503,13 +503,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -528,13 +528,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -553,13 +553,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -578,13 +578,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", @@ -603,13 +603,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp", "functionname:integration-tests-extension-XXXXXX-error-csharp", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/error-java b/test/integration/serverless/snapshots/error-java index d06b2e1fef735..e39cc94b00592 100644 --- a/test/integration/serverless/snapshots/error-java +++ b/test/integration/serverless/snapshots/error-java @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -103,13 +103,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -128,13 +128,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -153,13 +153,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -178,13 +178,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "init_type:on-demand", "memorysize:1024", @@ -204,13 +204,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "init_type:on-demand", "memorysize:1024", @@ -230,13 +230,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -255,13 +255,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -280,13 +280,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -305,13 +305,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -330,13 +330,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -355,13 +355,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -380,13 +380,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -405,13 +405,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -430,13 +430,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -455,13 +455,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -480,13 +480,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -505,13 +505,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -530,13 +530,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", @@ -555,13 +555,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java", "functionname:integration-tests-extension-XXXXXX-error-java", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/error-node b/test/integration/serverless/snapshots/error-node index 856b87613ef07..da0688d846148 100644 --- a/test/integration/serverless/snapshots/error-node +++ b/test/integration/serverless/snapshots/error-node @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -103,14 +103,14 @@ "metric": "aws.lambda.enhanced.errors", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "datadog_lambda:vX.X.X", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -129,14 +129,14 @@ "metric": "aws.lambda.enhanced.errors", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "datadog_lambda:vX.X.X", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -155,13 +155,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -180,13 +180,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -205,13 +205,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -230,13 +230,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "init_type:on-demand", "memorysize:1024", @@ -256,13 +256,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "init_type:on-demand", "memorysize:1024", @@ -282,13 +282,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -307,13 +307,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -332,13 +332,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -357,13 +357,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -382,13 +382,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -407,13 +407,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -432,13 +432,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -457,13 +457,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -482,13 +482,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -507,13 +507,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -532,13 +532,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -557,13 +557,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -582,13 +582,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", @@ -607,13 +607,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node", "functionname:integration-tests-extension-XXXXXX-error-node", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/error-proxy b/test/integration/serverless/snapshots/error-proxy index 2c7c202437e1b..cf390fa818377 100644 --- a/test/integration/serverless/snapshots/error-proxy +++ b/test/integration/serverless/snapshots/error-proxy @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -103,12 +103,12 @@ "metric": "aws.lambda.enhanced.errors", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -127,12 +127,12 @@ "metric": "aws.lambda.enhanced.errors", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -151,13 +151,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -176,13 +176,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -201,13 +201,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -226,13 +226,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "init_type:on-demand", "memorysize:1024", @@ -252,13 +252,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "init_type:on-demand", "memorysize:1024", @@ -278,13 +278,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -303,13 +303,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -328,13 +328,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -353,13 +353,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -378,13 +378,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -403,13 +403,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -428,13 +428,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -453,13 +453,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -478,13 +478,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -503,13 +503,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -528,13 +528,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -553,13 +553,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -578,13 +578,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", @@ -603,13 +603,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy", "functionname:integration-tests-extension-XXXXXX-error-proxy", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/error-python b/test/integration/serverless/snapshots/error-python index b4edbd4e36326..f1dea142bdb9a 100644 --- a/test/integration/serverless/snapshots/error-python +++ b/test/integration/serverless/snapshots/error-python @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -103,15 +103,15 @@ "metric": "aws.lambda.enhanced.errors", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "datadog_lambda:vX.X.X", "dd_extension_version:123", "dd_lambda_layer:datadog-pythonX.X.X", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -130,15 +130,15 @@ "metric": "aws.lambda.enhanced.errors", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "datadog_lambda:vX.X.X", "dd_extension_version:123", "dd_lambda_layer:datadog-pythonX.X.X", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -157,13 +157,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -182,13 +182,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -207,13 +207,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -232,13 +232,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "init_type:on-demand", "memorysize:1024", @@ -258,13 +258,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "init_type:on-demand", "memorysize:1024", @@ -284,13 +284,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -309,13 +309,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -334,13 +334,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -359,13 +359,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -384,13 +384,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -409,13 +409,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -434,13 +434,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -459,13 +459,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -484,13 +484,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -509,13 +509,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -534,13 +534,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -559,13 +559,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -584,13 +584,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", @@ -609,13 +609,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python", "functionname:integration-tests-extension-XXXXXX-error-python", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/log-csharp b/test/integration/serverless/snapshots/log-csharp index 82c50357e2f0b..54beeeb033920 100644 --- a/test/integration/serverless/snapshots/log-csharp +++ b/test/integration/serverless/snapshots/log-csharp @@ -1,170 +1,182 @@ [ { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n", + "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" } ] diff --git a/test/integration/serverless/snapshots/log-go b/test/integration/serverless/snapshots/log-go index 6856ee8e63c15..e1bada356cfd5 100644 --- a/test/integration/serverless/snapshots/log-go +++ b/test/integration/serverless/snapshots/log-go @@ -1,170 +1,182 @@ [ { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "XXX LOG 0 XXX\n", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "XXX LOG 1 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "XXX LOG 2 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "XXX LOG 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "XXX LOG 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "XXX LOG 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "XXX LOG 2 XXX\n", + "message": "XXX LOG 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "XXX LOG 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "XXX LOG 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" } ] diff --git a/test/integration/serverless/snapshots/log-java b/test/integration/serverless/snapshots/log-java index e7b6a7cfca0f3..3d4b9a038af53 100644 --- a/test/integration/serverless/snapshots/log-java +++ b/test/integration/serverless/snapshots/log-java @@ -1,198 +1,212 @@ [ { "message": { - "message": "Picked up JAVA_TOOL_OPTIONS: -javaagent:\"/opt/java/lib/dd-java-agent.jar\" -XX:+TieredCompilation -XX:TieredStopAtLevel=1\n", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "[dd.trace TIMESTAMP +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Serverless extension has been detected, using DDAgentWriter\n", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "Picked up JAVA_TOOL_OPTIONS: -javaagent:\"/opt/java/lib/dd-java-agent.jar\" -XX:+TieredCompilation -XX:TieredStopAtLevel=1\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "XXX Log 0 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "XXX Log 1 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "XXX Log 2 XXX\n", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "XXX Log 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "XXX Log 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "XXX Log 0 XXX\n", + "message": "XXX Log 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "XXX Log 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "XXX Log 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "XXX Log 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "[dd.trace TIMESTAMP +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Serverless extension has been detected, using DDAgentWriter\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" } ] diff --git a/test/integration/serverless/snapshots/log-node b/test/integration/serverless/snapshots/log-node index 5577b08a290b9..114d007abacd4 100644 --- a/test/integration/serverless/snapshots/log-node +++ b/test/integration/serverless/snapshots/log-node @@ -1,198 +1,212 @@ [ { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" } ] diff --git a/test/integration/serverless/snapshots/log-proxy b/test/integration/serverless/snapshots/log-proxy index cef6ff6e4bdde..283aa1a2633c4 100644 --- a/test/integration/serverless/snapshots/log-proxy +++ b/test/integration/serverless/snapshots/log-proxy @@ -1,198 +1,182 @@ [ { "message": { - "message": "START RequestId: XXX Version: $LATEST", - "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", - "request_id": "XXX" - } - }, - "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", - "service": "integration-tests-service", - "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" - }, - { - "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n", - "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", - "request_id": "XXX" - } - }, - "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", - "service": "integration-tests-service", - "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" - }, - { - "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP http: proxy error: context canceled\n", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "TIMESTAMP UTC | DD_EXTENSION | ERROR | could not forward the request context canceled\n", + "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" } ] diff --git a/test/integration/serverless/snapshots/log-python b/test/integration/serverless/snapshots/log-python index 537a75857add3..fb4a414c6b42c 100644 --- a/test/integration/serverless/snapshots/log-python +++ b/test/integration/serverless/snapshots/log-python @@ -1,170 +1,182 @@ [ { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n", + "message": "END RequestId: XXX", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n", + "message": "REPORT", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "START RequestId: XXX Version: $LATEST", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "START RequestId: XXX Version: $LATEST", + "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n", + "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "END RequestId: XXX", + "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" }, { "message": { - "message": "REPORT", + "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n", "lambda": { - "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "request_id": "XXX" } }, "status": "info", - "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python", + "timestamp": "XXX", + "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python", "service": "integration-tests-service", "ddsource": "lambda", - "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" + "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version" } ] diff --git a/test/integration/serverless/snapshots/metric-csharp b/test/integration/serverless/snapshots/metric-csharp index a1bd1d6e488e7..09b0ae76a108c 100644 --- a/test/integration/serverless/snapshots/metric-csharp +++ b/test/integration/serverless/snapshots/metric-csharp @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -103,13 +103,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -128,13 +128,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -153,13 +153,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -178,13 +178,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "init_type:on-demand", "memorysize:1024", @@ -204,13 +204,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "init_type:on-demand", "memorysize:1024", @@ -230,13 +230,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -255,13 +255,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -280,13 +280,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -305,13 +305,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -330,13 +330,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -355,13 +355,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -380,13 +380,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -405,13 +405,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -430,13 +430,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -455,13 +455,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -480,13 +480,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -505,13 +505,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -530,13 +530,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", @@ -555,13 +555,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp", "functionname:integration-tests-extension-XXXXXX-metric-csharp", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/metric-go b/test/integration/serverless/snapshots/metric-go index d55d03899f9cc..fe42f8a7a6a27 100644 --- a/test/integration/serverless/snapshots/metric-go +++ b/test/integration/serverless/snapshots/metric-go @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -103,13 +103,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -128,13 +128,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -153,13 +153,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -178,13 +178,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "init_type:on-demand", "memorysize:1024", @@ -204,13 +204,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "init_type:on-demand", "memorysize:1024", @@ -230,13 +230,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -255,13 +255,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -280,13 +280,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -305,13 +305,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -330,13 +330,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -355,13 +355,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -380,13 +380,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -405,13 +405,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -430,13 +430,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -455,13 +455,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -480,13 +480,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -505,13 +505,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -530,13 +530,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -555,13 +555,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -580,13 +580,13 @@ "metric": "serverless.lambda-extension.integration-test.count", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "dd_extension_version:123", "dd_lambda_layer:datadog-gox.x.x", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", @@ -605,13 +605,13 @@ "metric": "serverless.lambda-extension.integration-test.count", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "dd_extension_version:123", "dd_lambda_layer:datadog-gox.x.x", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go", "functionname:integration-tests-extension-XXXXXX-metric-go", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/metric-java b/test/integration/serverless/snapshots/metric-java index 96e8d1648ed46..882ddcd6cb40a 100644 --- a/test/integration/serverless/snapshots/metric-java +++ b/test/integration/serverless/snapshots/metric-java @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -103,13 +103,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -128,13 +128,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -153,13 +153,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -178,13 +178,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "init_type:on-demand", "memorysize:1024", @@ -204,13 +204,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "init_type:on-demand", "memorysize:1024", @@ -230,13 +230,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -255,13 +255,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -280,13 +280,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -305,13 +305,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -330,13 +330,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -355,13 +355,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -380,13 +380,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -405,13 +405,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -430,13 +430,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -455,13 +455,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -480,13 +480,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -505,13 +505,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -530,13 +530,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", @@ -555,13 +555,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java", "functionname:integration-tests-extension-XXXXXX-metric-java", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/metric-node b/test/integration/serverless/snapshots/metric-node index 2d834d8450590..f6d8e2802366a 100644 --- a/test/integration/serverless/snapshots/metric-node +++ b/test/integration/serverless/snapshots/metric-node @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -103,13 +103,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -128,13 +128,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -153,13 +153,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -178,13 +178,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "init_type:on-demand", "memorysize:1024", @@ -204,13 +204,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "init_type:on-demand", "memorysize:1024", @@ -230,13 +230,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -255,13 +255,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -280,13 +280,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -305,13 +305,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -330,13 +330,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -355,13 +355,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -380,13 +380,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -405,13 +405,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -430,13 +430,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -455,13 +455,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -480,13 +480,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -505,13 +505,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -530,13 +530,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -555,13 +555,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", @@ -580,13 +580,13 @@ "metric": "serverless.lambda-extension.integration-test.count", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "dd_extension_version:123", "dd_lambda_layer:datadog-nodevX.X.X", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node", "functionname:integration-tests-extension-XXXXXX-metric-node", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/metric-proxy b/test/integration/serverless/snapshots/metric-proxy index aa14b046683df..0e2bb6a2b6f9b 100644 --- a/test/integration/serverless/snapshots/metric-proxy +++ b/test/integration/serverless/snapshots/metric-proxy @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -103,13 +103,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -128,13 +128,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -153,13 +153,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -178,13 +178,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "init_type:on-demand", "memorysize:1024", @@ -204,13 +204,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "init_type:on-demand", "memorysize:1024", @@ -230,13 +230,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -255,13 +255,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -280,13 +280,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -305,13 +305,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -330,13 +330,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -355,13 +355,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -380,13 +380,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -405,13 +405,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -430,13 +430,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -455,13 +455,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -480,13 +480,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -505,13 +505,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -530,13 +530,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", @@ -555,13 +555,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy", "functionname:integration-tests-extension-XXXXXX-metric-proxy", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/metric-python b/test/integration/serverless/snapshots/metric-python index 1e2d144949372..e9ad1f0dc60eb 100644 --- a/test/integration/serverless/snapshots/metric-python +++ b/test/integration/serverless/snapshots/metric-python @@ -3,13 +3,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -28,13 +28,13 @@ "metric": "aws.lambda.enhanced.billed_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -53,13 +53,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -78,13 +78,13 @@ "metric": "aws.lambda.enhanced.duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -103,13 +103,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -128,13 +128,13 @@ "metric": "aws.lambda.enhanced.estimated_cost", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -153,13 +153,13 @@ "metric": "aws.lambda.enhanced.init_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -178,13 +178,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "init_type:on-demand", "memorysize:1024", @@ -204,13 +204,13 @@ "metric": "aws.lambda.enhanced.invocations", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "init_type:on-demand", "memorysize:1024", @@ -230,13 +230,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -255,13 +255,13 @@ "metric": "aws.lambda.enhanced.max_memory_used", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -280,13 +280,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -305,13 +305,13 @@ "metric": "aws.lambda.enhanced.memorysize", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -330,13 +330,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -355,13 +355,13 @@ "metric": "aws.lambda.enhanced.post_runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -380,13 +380,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -405,13 +405,13 @@ "metric": "aws.lambda.enhanced.produced_bytes", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -430,13 +430,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -455,13 +455,13 @@ "metric": "aws.lambda.enhanced.response_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -480,13 +480,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -505,13 +505,13 @@ "metric": "aws.lambda.enhanced.response_latency", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -530,13 +530,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:true", + "aws_account:425362996713", + "cold_start:false", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -555,13 +555,13 @@ "metric": "aws.lambda.enhanced.runtime_duration", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", - "cold_start:false", + "aws_account:425362996713", + "cold_start:true", "dd_extension_version:123", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", @@ -580,13 +580,13 @@ "metric": "serverless.lambda-extension.integration-test.count", "distributions": null, "tags": [ - "account_id:601427279990", + "account_id:425362996713", "architecture:XXX", - "aws_account:601427279990", + "aws_account:425362996713", "dd_extension_version:123", "dd_lambda_layer:datadog-pythonX.X.X", "env:integration-tests-env", - "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python", + "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python", "functionname:integration-tests-extension-XXXXXX-metric-python", "memorysize:1024", "region:eu-west-1", diff --git a/test/integration/serverless/snapshots/timeout-csharp b/test/integration/serverless/snapshots/timeout-csharp index 8b137891791fe..059f4251737b1 100644 --- a/test/integration/serverless/snapshots/timeout-csharp +++ b/test/integration/serverless/snapshots/timeout-csharp @@ -1 +1,3 @@ - +{ + "error": "normalization raised exception" +} diff --git a/test/integration/serverless/snapshots/timeout-go b/test/integration/serverless/snapshots/timeout-go index 8b137891791fe..059f4251737b1 100644 --- a/test/integration/serverless/snapshots/timeout-go +++ b/test/integration/serverless/snapshots/timeout-go @@ -1 +1,3 @@ - +{ + "error": "normalization raised exception" +} diff --git a/test/integration/serverless/snapshots/timeout-java b/test/integration/serverless/snapshots/timeout-java index 8b137891791fe..059f4251737b1 100644 --- a/test/integration/serverless/snapshots/timeout-java +++ b/test/integration/serverless/snapshots/timeout-java @@ -1 +1,3 @@ - +{ + "error": "normalization raised exception" +} diff --git a/test/integration/serverless/snapshots/timeout-node b/test/integration/serverless/snapshots/timeout-node index 8b137891791fe..059f4251737b1 100644 --- a/test/integration/serverless/snapshots/timeout-node +++ b/test/integration/serverless/snapshots/timeout-node @@ -1 +1,3 @@ - +{ + "error": "normalization raised exception" +} diff --git a/test/integration/serverless/snapshots/timeout-proxy b/test/integration/serverless/snapshots/timeout-proxy index 8b137891791fe..059f4251737b1 100644 --- a/test/integration/serverless/snapshots/timeout-proxy +++ b/test/integration/serverless/snapshots/timeout-proxy @@ -1 +1,3 @@ - +{ + "error": "normalization raised exception" +} diff --git a/test/integration/serverless/snapshots/timeout-python b/test/integration/serverless/snapshots/timeout-python index 8b137891791fe..059f4251737b1 100644 --- a/test/integration/serverless/snapshots/timeout-python +++ b/test/integration/serverless/snapshots/timeout-python @@ -1 +1,3 @@ - +{ + "error": "normalization raised exception" +} diff --git a/test/integration/serverless/snapshots/trace-csharp b/test/integration/serverless/snapshots/trace-csharp index 2d6df8278c36d..63126c73288b3 100644 --- a/test/integration/serverless/snapshots/trace-csharp +++ b/test/integration/serverless/snapshots/trace-csharp @@ -22,13 +22,13 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "component": "WebRequest", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-csharp", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-csharp", "functionname": "integration-tests-extension-XXXXXX-trace-csharp", "http.method": "GET", "http.status_code": "200", @@ -48,6 +48,7 @@ "metrics": { "_dd.top_level": 1, "_dd.tracer_kr": 0, + "_sampling_priority_rate_v1": 1, "_sampling_priority_v1": 1, "_top_level": 1, "process_id": null @@ -87,13 +88,13 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "component": "WebRequest", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-csharp", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-csharp", "functionname": "integration-tests-extension-XXXXXX-trace-csharp", "http.method": "GET", "http.status_code": "200", @@ -113,6 +114,7 @@ "metrics": { "_dd.top_level": 1, "_dd.tracer_kr": 1, + "_sampling_priority_rate_v1": 1, "_sampling_priority_v1": 1, "_top_level": 1, "process_id": null diff --git a/test/integration/serverless/snapshots/trace-go b/test/integration/serverless/snapshots/trace-go index e1747ab1fbe51..23b01771d794e 100644 --- a/test/integration/serverless/snapshots/trace-go +++ b/test/integration/serverless/snapshots/trace-go @@ -22,12 +22,12 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go", "functionname": "integration-tests-extension-XXXXXX-trace-go", "memorysize": "1024", "region": "eu-west-1", @@ -40,9 +40,10 @@ "version": "integration-tests-version" }, "metrics": { + "_sampling_priority_rate_v1": 1, "_top_level": 1 }, - "type": "" + "type": "serverless" } ], "tags": null, @@ -79,15 +80,15 @@ "_dd.compute_stats": "1", "_dd.origin": "lambda", "_dd.p.upstream_services": "YXdzLmxhbWJkYQ|1|1|1.0000", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "cold_start": "true", "datadog_lambda": "X.X.X", "dd_extension_version": "123", "dd_trace": "X.X.X", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go", "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-trace-go", "memorysize": "1024", @@ -127,12 +128,12 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go", "functionname": "integration-tests-extension-XXXXXX-trace-go", "http.method": "GET", "http.status_code": "200", @@ -168,12 +169,12 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go", "functionname": "integration-tests-extension-XXXXXX-trace-go", "memorysize": "1024", "region": "eu-west-1", @@ -228,15 +229,15 @@ "_dd.compute_stats": "1", "_dd.origin": "lambda", "_dd.p.upstream_services": "YXdzLmxhbWJkYQ|1|1|1.0000", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "cold_start": "false", "datadog_lambda": "X.X.X", "dd_extension_version": "123", "dd_trace": "X.X.X", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go", "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-trace-go", "memorysize": "1024", @@ -276,12 +277,12 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go", "functionname": "integration-tests-extension-XXXXXX-trace-go", "http.method": "GET", "http.status_code": "200", @@ -317,12 +318,12 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go", "functionname": "integration-tests-extension-XXXXXX-trace-go", "memorysize": "1024", "region": "eu-west-1", diff --git a/test/integration/serverless/snapshots/trace-java b/test/integration/serverless/snapshots/trace-java index bcfd53b4bb9da..40a7dd423a045 100644 --- a/test/integration/serverless/snapshots/trace-java +++ b/test/integration/serverless/snapshots/trace-java @@ -1,7 +1,7 @@ [ { "container_id": "", - "language_name": "", + "language_name": "java", "language_version": null, "tracer_version": null, "runtime_id": "", @@ -12,7 +12,7 @@ "spans": [ { "service": "integration-tests-service", - "name": "aws.lambda.cold_start", + "name": "aws.lambda", "resource": "integration-tests-extension-XXXXXX-trace-java", "trace_id": null, "span_id": null, @@ -22,25 +22,39 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", + "cold_start": "true", + "datadog_lambda": "X.X.X", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-java", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-java", + "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-trace-java", + "language": "jvm", "memorysize": "1024", "region": "eu-west-1", + "request_id": "null", + "resource_names": "integration-tests-extension-XXXXXX-trace-java", "runtime": "java8.al2", + "runtime-id": "null", "service": "integration-tests-service", + "tagA": "valueA", + "tagB": "valueB", "taga": "valuea", "tagb": "valueb", "tagc": "valuec", "tagd": "valued", + "thread.name": "main", "version": "integration-tests-version" }, "metrics": { - "_top_level": 1 + "_dd.agent_psr": 1, + "_dd.top_level": 1, + "_sampling_priority_v1": 1, + "_top_level": 1, + "thread.id": 1 }, "type": "" } @@ -56,7 +70,7 @@ }, { "container_id": "", - "language_name": "java", + "language_name": "", "language_version": null, "tracer_version": null, "runtime_id": "", @@ -67,7 +81,7 @@ "spans": [ { "service": "integration-tests-service", - "name": "aws.lambda", + "name": "aws.lambda.cold_start", "resource": "integration-tests-extension-XXXXXX-trace-java", "trace_id": null, "span_id": null, @@ -77,41 +91,28 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", - "cold_start": "true", - "datadog_lambda": "X.X.X", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-java", - "function_version": "$LATEST", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-java", "functionname": "integration-tests-extension-XXXXXX-trace-java", - "language": "jvm", "memorysize": "1024", "region": "eu-west-1", - "request_id": "null", - "resource_names": "integration-tests-extension-XXXXXX-trace-java", "runtime": "java8.al2", - "runtime-id": "null", "service": "integration-tests-service", - "tagA": "valueA", - "tagB": "valueB", "taga": "valuea", "tagb": "valueb", "tagc": "valuec", "tagd": "valued", - "thread.name": "main", "version": "integration-tests-version" }, "metrics": { - "_dd.agent_psr": 1, - "_dd.top_level": 1, - "_sampling_priority_v1": 1, - "_top_level": 1, - "thread.id": 1 + "_sampling_priority_rate_v1": 1, + "_top_level": 1 }, - "type": "" + "type": "serverless" } ], "tags": null, @@ -146,14 +147,14 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "cold_start": "false", "datadog_lambda": "X.X.X", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-java", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-java", "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-trace-java", "language": "jvm", diff --git a/test/integration/serverless/snapshots/trace-node b/test/integration/serverless/snapshots/trace-node index f48a632647f40..14604c1acd8c2 100644 --- a/test/integration/serverless/snapshots/trace-node +++ b/test/integration/serverless/snapshots/trace-node @@ -1,7 +1,7 @@ [ { "container_id": "", - "language_name": "", + "language_name": "nodejs", "language_version": null, "tracer_version": null, "runtime_id": "", @@ -12,8 +12,8 @@ "spans": [ { "service": "integration-tests-service", - "name": "aws.lambda.cold_start", - "resource": "integration-tests-extension-XXXXXX-trace-node", + "name": "integration_test", + "resource": "integration-test", "trace_id": null, "span_id": null, "parent_id": null, @@ -22,17 +22,20 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "_dd.origin": "lambda", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node", "functionname": "integration-tests-extension-XXXXXX-trace-node", + "language": "javascript", "memorysize": "1024", "region": "eu-west-1", "runtime": "nodejs14.x", "service": "integration-tests-service", + "tagA": "valueA tagB:valueB", "taga": "valuea", "tagb": "valueb", "tagc": "valuec", @@ -40,35 +43,16 @@ "version": "integration-tests-version" }, "metrics": { - "_top_level": 1 + "_dd.measured": 1, + "_sample_rate": 1, + "_sampling_priority_v1": 1 }, "type": "" - } - ], - "tags": null, - "dropped_trace": false - } - ], - "tags": null, - "env": "integration-tests-env", - "hostname": "", - "app_version": "integration-tests-version" - }, - { - "container_id": "", - "language_name": "nodejs", - "language_version": null, - "tracer_version": null, - "runtime_id": "", - "chunks": [ - { - "priority": 1, - "origin": "lambda", - "spans": [ + }, { "service": "integration-tests-service", - "name": "integration_test", - "resource": "integration-test", + "name": "aws.lambda", + "resource": "integration-tests-extension-XXXXXX-trace-node", "trace_id": null, "span_id": null, "parent_id": null, @@ -78,16 +62,22 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", + "cold_start": "true", + "datadog_lambda": "X.X.X", "dd_extension_version": "123", + "dd_trace": "X.X.X", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node", + "function.response.body": "ok", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node", + "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-trace-node", - "language": "javascript", "memorysize": "1024", "region": "eu-west-1", + "request_id": "null", + "resource_names": "integration-tests-extension-XXXXXX-trace-node", "runtime": "nodejs14.x", "service": "integration-tests-service", "tagA": "valueA tagB:valueB", @@ -98,15 +88,39 @@ "version": "integration-tests-version" }, "metrics": { + "_dd.agent_psr": 1, "_dd.measured": 1, "_sample_rate": 1, - "_sampling_priority_v1": 1 + "_sampling_priority_v1": 1, + "_top_level": 1, + "function.response.statusCode": 200 }, - "type": "" - }, + "type": "serverless" + } + ], + "tags": null, + "dropped_trace": false + } + ], + "tags": null, + "env": "integration-tests-env", + "hostname": "", + "app_version": "integration-tests-version" + }, + { + "container_id": "", + "language_name": "", + "language_version": null, + "tracer_version": null, + "runtime_id": "", + "chunks": [ + { + "priority": 1, + "origin": "lambda", + "spans": [ { "service": "integration-tests-service", - "name": "aws.lambda", + "name": "aws.lambda.cold_start", "resource": "integration-tests-extension-XXXXXX-trace-node", "trace_id": null, "span_id": null, @@ -116,26 +130,17 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", - "cold_start": "true", - "datadog_lambda": "X.X.X", + "aws_account": "425362996713", "dd_extension_version": "123", - "dd_trace": "X.X.X", "env": "integration-tests-env", - "function.response.body": "ok", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node", - "function_version": "$LATEST", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node", "functionname": "integration-tests-extension-XXXXXX-trace-node", "memorysize": "1024", "region": "eu-west-1", - "request_id": "null", - "resource_names": "integration-tests-extension-XXXXXX-trace-node", "runtime": "nodejs14.x", "service": "integration-tests-service", - "tagA": "valueA tagB:valueB", "taga": "valuea", "tagb": "valueb", "tagc": "valuec", @@ -143,12 +148,8 @@ "version": "integration-tests-version" }, "metrics": { - "_dd.agent_psr": 1, - "_dd.measured": 1, - "_sample_rate": 1, - "_sampling_priority_v1": 1, - "_top_level": 1, - "function.response.statusCode": 200 + "_sampling_priority_rate_v1": 1, + "_top_level": 1 }, "type": "serverless" } @@ -186,12 +187,12 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node", "functionname": "integration-tests-extension-XXXXXX-trace-node", "language": "javascript", "memorysize": "1024", @@ -225,9 +226,9 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "cold_start": "false", "datadog_lambda": "X.X.X", "dd_extension_version": "123", @@ -235,7 +236,7 @@ "env": "integration-tests-env", "function.request.body": "testing request payload", "function.response.body": "ok", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node", "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-trace-node", "memorysize": "1024", diff --git a/test/integration/serverless/snapshots/trace-proxy b/test/integration/serverless/snapshots/trace-proxy index 8b137891791fe..059f4251737b1 100644 --- a/test/integration/serverless/snapshots/trace-proxy +++ b/test/integration/serverless/snapshots/trace-proxy @@ -1 +1,3 @@ - +{ + "error": "normalization raised exception" +} diff --git a/test/integration/serverless/snapshots/trace-python b/test/integration/serverless/snapshots/trace-python index b8821ad44ff2a..dc673bda42c5a 100644 --- a/test/integration/serverless/snapshots/trace-python +++ b/test/integration/serverless/snapshots/trace-python @@ -22,12 +22,12 @@ "error": 0, "meta": { "_dd.compute_stats": "1", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python", "functionname": "integration-tests-extension-XXXXXX-trace-python", "memorysize": "1024", "region": "eu-west-1", @@ -40,9 +40,10 @@ "version": "integration-tests-version" }, "metrics": { + "_sampling_priority_rate_v1": 1, "_top_level": 1 }, - "type": "" + "type": "serverless" } ], "tags": null, @@ -78,16 +79,16 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "cold_start": "true", "datadog_lambda": "X.X.X", "dd_extension_version": "123", "dd_trace": "X.X.X", "env": "integration-tests-env", "function.response.body": "ok", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python", "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-trace-python", "memorysize": "1024", @@ -128,12 +129,12 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python", "functionname": "integration-tests-extension-XXXXXX-trace-python", "memorysize": "1024", "region": "eu-west-1", @@ -184,9 +185,9 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "cold_start": "false", "datadog_lambda": "X.X.X", "dd_extension_version": "123", @@ -194,7 +195,7 @@ "env": "integration-tests-env", "function.request.body": "testing request payload", "function.response.body": "ok", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python", "function_version": "$LATEST", "functionname": "integration-tests-extension-XXXXXX-trace-python", "memorysize": "1024", @@ -235,12 +236,12 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "601427279990", + "account_id": "425362996713", "architecture": "XXX", - "aws_account": "601427279990", + "aws_account": "425362996713", "dd_extension_version": "123", "env": "integration-tests-env", - "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python", + "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python", "functionname": "integration-tests-extension-XXXXXX-trace-python", "memorysize": "1024", "region": "eu-west-1",