diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 9a00b695..5eb8aaf0 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -22,7 +22,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.10", "3.11"] + python-version: ["3.11", "3.12"] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8766933e..4a2ccb61 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.10', '3.11'] + python-version: ['3.11', '3.12'] steps: - name: Checkout source uses: actions/checkout@v3 diff --git a/aws/logs_monitoring/requirements.txt b/aws/logs_monitoring/requirements.txt index 46b88f65..5f621d75 100644 --- a/aws/logs_monitoring/requirements.txt +++ b/aws/logs_monitoring/requirements.txt @@ -3,10 +3,10 @@ bytecode cattrs certifi charset-normalizer -datadog-lambda==5.87.0 -datadog==0.48.0 -ddsketch==2.0.4 -ddtrace==2.6.5 +datadog-lambda==6.104.0 +datadog==0.50.2 +ddsketch==3.0.1 +ddtrace==2.17.3 deprecated envier exceptiongroup @@ -22,3 +22,4 @@ urllib3>=1.26.19,<3.0 wrapt==1.14.0 xmltodict zipp +ujson diff --git a/aws/logs_monitoring/setup.py b/aws/logs_monitoring/setup.py index ba483de2..e58ef869 100644 --- a/aws/logs_monitoring/setup.py +++ b/aws/logs_monitoring/setup.py @@ -12,11 +12,11 @@ author="Datadog, Inc.", author_email="dev@datadoghq.com", classifiers=[ - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], keywords="datadog aws lambda layer", - python_requires=">=3.10, <3.12", + python_requires=">=3.11, <3.13", extras_require={ "dev": ["nose2==0.9.1", "flake8==3.7.9", "requests==2.22.0", "boto3==1.10.33"] }, diff --git a/aws/logs_monitoring/template.yaml b/aws/logs_monitoring/template.yaml index 79b23133..dfb856df 100644 --- a/aws/logs_monitoring/template.yaml +++ b/aws/logs_monitoring/template.yaml @@ -259,6 +259,13 @@ Parameters: - WARN - ERROR - CRITICAL + DdTraceEnabled: + Type: String + Default: "true" + AllowedValues: + - "true" + - "false" + Description: Set to false to disable trace forwarding. Conditions: IsAWSChina: !Equals [!Ref 'AWS::Partition', aws-cn] IsGovCloud: !Equals [!Ref 'AWS::Partition', aws-us-gov] @@ -348,6 +355,7 @@ Conditions: - !Equals [!Join ["", !Ref VPCSubnetIds], ""] SetDdLogLevel: !Not - !Equals [!Ref DdLogLevel, ""] + SetDdTraceEnabled: !Equals [!Ref DdTraceEnabled, false] Rules: MustSetDdApiKey: Assertions: @@ -396,7 +404,7 @@ Resources: - {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]} - ZipFile: " " MemorySize: !Ref MemorySize - Runtime: python3.11 + Runtime: python3.12 Timeout: !Ref Timeout Tags: - Key: "dd_forwarder_version" @@ -540,6 +548,10 @@ Resources: - SetDdLogLevel - !Ref DdLogLevel - !Ref AWS::NoValue + DD_TRACE_ENABLED: !If + - SetDdTraceEnabled + - !Ref DdTraceEnabled + - "true" ReservedConcurrentExecutions: !If - SetReservedConcurrentExecutions - !Ref ReservedConcurrency @@ -724,7 +736,7 @@ Resources: - !Ref AWS::NoValue BucketEncryption: ServerSideEncryptionConfiguration: - - BucketKeyEnabled: true + - BucketKeyEnabled: true ServerSideEncryptionByDefault: SSEAlgorithm: "aws:kms" PublicAccessBlockConfiguration: @@ -788,7 +800,7 @@ Resources: Properties: Description: Copies Datadog Forwarder zip to the destination S3 bucket Handler: index.handler - Runtime: python3.11 + Runtime: python3.12 Timeout: 600 Code: ZipFile: | diff --git a/aws/logs_monitoring/tools/build_bundle.sh b/aws/logs_monitoring/tools/build_bundle.sh index ec6f55f0..0ed2f5b3 100755 --- a/aws/logs_monitoring/tools/build_bundle.sh +++ b/aws/logs_monitoring/tools/build_bundle.sh @@ -42,7 +42,7 @@ else VERSION=$1 fi -PYTHON_VERSION="${PYTHON_VERSION:-3.11}" +PYTHON_VERSION="${PYTHON_VERSION:-3.12}" FORWARDER_PREFIX="aws-dd-forwarder" FORWARDER_DIR="../.forwarder" diff --git a/aws/logs_monitoring/tools/integration_tests/docker-compose.yml b/aws/logs_monitoring/tools/integration_tests/docker-compose.yml index b1277047..fd9dd71d 100644 --- a/aws/logs_monitoring/tools/integration_tests/docker-compose.yml +++ b/aws/logs_monitoring/tools/integration_tests/docker-compose.yml @@ -26,7 +26,7 @@ services: AWS_SECRET_ACCESS_KEY: "${AWS_SECRET_ACCESS_KEY}" AWS_SECURITY_TOKEN: "${AWS_SECURITY_TOKEN}" AWS_SESSION_TOKEN: "${AWS_SESSION_TOKEN}" - DOCKER_LAMBDA_STAY_OPEN: 1 + AWS_DEFAULT_REGION: us-east-1 DD_LOG_LEVEL: ${LOG_LEVEL:-info} DD_API_KEY: abcdefghijklmnopqrstuvwxyz012345 # Must be 32 characters exactly DD_URL: recorder # Used for logs intake @@ -45,11 +45,18 @@ services: DD_FETCH_LOG_GROUP_TAGS: "true" DD_FETCH_STEP_FUNCTIONS_TAGS: "false" # intentionally set false to allow integration test for step function logs to run without hitting aws DD_STORE_FAILED_EVENTS: "false" + DD_TRACE_ENABLED: "true" expose: - - 9001 + - 8080 depends_on: recorder: condition: service_healthy + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8080/2015-03-31/functions/function/invocations"] + interval: 10s + timeout: 5s + retries: 3 + tester: image: ${PYTHON_BASE} @@ -60,8 +67,11 @@ services: working_dir: /tester environment: RECORDER_URL: http://recorder:8080/recording - FORWARDER_URL: http://forwarder:9001/2015-03-31/functions/myfunction/invocations + FORWARDER_URL: http://forwarder:8080/2015-03-31/functions/function/invocations UPDATE_SNAPSHOTS: ${UPDATE_SNAPSHOTS:-false} SNAPSHOTS_DIR_NAME: ${SNAPSHOTS_DIR_NAME} depends_on: - - forwarder + forwarder: + condition: service_healthy + recorder: + condition: service_healthy diff --git a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh index 5a65647e..3afd99ac 100755 --- a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh +++ b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh @@ -7,8 +7,9 @@ set -e -PYTHON_VERSION="python3.11" -PYTHON_IMAGE="python:3.11" +PYTHON_VERSION="python3.12" +PYTHON_VERSION_TAG="3.12" +PYTHON_IMAGE="python:3.12" SKIP_FORWARDER_BUILD=false UPDATE_SNAPSHOTS=false LOG_LEVEL=info @@ -38,10 +39,11 @@ for arg in "$@"; do # -v or --python-version # The version of the Python Lambda runtime to use - # Must be 3.9 or 3.10 + # Must be 3.11 or 3.12 -v=* | --python-version=*) PYTHON_VERSION="python${arg#*=}" PYTHON_IMAGE="python:${arg#*=}" + PYTHON_VERSION_TAG="${arg#*=}" shift ;; @@ -78,8 +80,8 @@ for arg in "$@"; do esac done -if [ $PYTHON_VERSION != "python3.10" ] && [ $PYTHON_VERSION != "python3.11" ]; then - echo "Must use either Python 3.10 or 3.11" +if [ $PYTHON_VERSION != "python3.11" ] && [ $PYTHON_VERSION != "python3.12" ]; then + echo "Must use either Python 3.11 or 3.12" exit 1 fi @@ -152,7 +154,7 @@ cd $INTEGRATION_TESTS_DIR echo "Building Docker Image for Forwarder with tag datadog-log-forwarder:$PYTHON_VERSION" docker buildx build --platform linux/amd64 --file "${INTEGRATION_TESTS_DIR}/forwarder/Dockerfile" -t "datadog-log-forwarder:$PYTHON_VERSION" ../../.forwarder --no-cache \ --build-arg forwarder='aws-dd-forwarder-0.0.0' \ - --build-arg image="mlupin/docker-lambda:${PYTHON_VERSION}-x86_64" + --build-arg image="public.ecr.aws/lambda/python:${PYTHON_VERSION_TAG}-x86_64" echo "Running integration tests for ${PYTHON_VERSION}" LOG_LEVEL=${LOG_LEVEL} \ diff --git a/aws/logs_monitoring/tools/integration_tests/recorder/pb/span_pb2.py b/aws/logs_monitoring/tools/integration_tests/recorder/pb/span_pb2.py index 68d1017c..02c47150 100644 --- a/aws/logs_monitoring/tools/integration_tests/recorder/pb/span_pb2.py +++ b/aws/logs_monitoring/tools/integration_tests/recorder/pb/span_pb2.py @@ -1,13 +1,18 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: span.proto +# Protobuf Python Version: 5.28.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, 5, 28, 1, "", "span.proto" +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -17,52 +22,19 @@ b'\n\nspan.proto\x12\x02pb"\xcf\x02\n\x04Span\x12\x0f\n\x07service\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x10\n\x08resource\x18\x03 \x01(\t\x12\x0f\n\x07traceID\x18\x04 \x01(\x04\x12\x0e\n\x06spanID\x18\x05 \x01(\x04\x12\x10\n\x08parentID\x18\x06 \x01(\x04\x12\r\n\x05start\x18\x07 \x01(\x03\x12\x10\n\x08\x64uration\x18\x08 \x01(\x03\x12\r\n\x05\x65rror\x18\t \x01(\x05\x12 \n\x04meta\x18\n \x03(\x0b\x32\x12.pb.Span.MetaEntry\x12&\n\x07metrics\x18\x0b \x03(\x0b\x32\x15.pb.Span.MetricsEntry\x12\x0c\n\x04type\x18\x0c \x01(\t\x1a+\n\tMetaEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a.\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x01:\x02\x38\x01\x62\x06proto3' ) - -_SPAN = DESCRIPTOR.message_types_by_name["Span"] -_SPAN_METAENTRY = _SPAN.nested_types_by_name["MetaEntry"] -_SPAN_METRICSENTRY = _SPAN.nested_types_by_name["MetricsEntry"] -Span = _reflection.GeneratedProtocolMessageType( - "Span", - (_message.Message,), - { - "MetaEntry": _reflection.GeneratedProtocolMessageType( - "MetaEntry", - (_message.Message,), - { - "DESCRIPTOR": _SPAN_METAENTRY, - "__module__": "span_pb2", - # @@protoc_insertion_point(class_scope:pb.Span.MetaEntry) - }, - ), - "MetricsEntry": _reflection.GeneratedProtocolMessageType( - "MetricsEntry", - (_message.Message,), - { - "DESCRIPTOR": _SPAN_METRICSENTRY, - "__module__": "span_pb2", - # @@protoc_insertion_point(class_scope:pb.Span.MetricsEntry) - }, - ), - "DESCRIPTOR": _SPAN, - "__module__": "span_pb2", - # @@protoc_insertion_point(class_scope:pb.Span) - }, -) - -_sym_db.RegisterMessage(Span) -_sym_db.RegisterMessage(Span.MetaEntry) -_sym_db.RegisterMessage(Span.MetricsEntry) - -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _SPAN_METAENTRY._options = None - _SPAN_METAENTRY._serialized_options = b"8\001" - _SPAN_METRICSENTRY._options = None - _SPAN_METRICSENTRY._serialized_options = b"8\001" - _SPAN._serialized_start = 19 - _SPAN._serialized_end = 354 - _SPAN_METAENTRY._serialized_start = 263 - _SPAN_METAENTRY._serialized_end = 306 - _SPAN_METRICSENTRY._serialized_start = 308 - _SPAN_METRICSENTRY._serialized_end = 354 +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "span_pb2", _globals) +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals["_SPAN_METAENTRY"]._loaded_options = None + _globals["_SPAN_METAENTRY"]._serialized_options = b"8\001" + _globals["_SPAN_METRICSENTRY"]._loaded_options = None + _globals["_SPAN_METRICSENTRY"]._serialized_options = b"8\001" + _globals["_SPAN"]._serialized_start = 19 + _globals["_SPAN"]._serialized_end = 354 + _globals["_SPAN_METAENTRY"]._serialized_start = 263 + _globals["_SPAN_METAENTRY"]._serialized_end = 306 + _globals["_SPAN_METRICSENTRY"]._serialized_start = 308 + _globals["_SPAN_METRICSENTRY"]._serialized_end = 354 # @@protoc_insertion_point(module_scope) diff --git a/aws/logs_monitoring/tools/integration_tests/recorder/pb/trace_payload_pb2.py b/aws/logs_monitoring/tools/integration_tests/recorder/pb/trace_payload_pb2.py index db6631f6..ea2238cf 100644 --- a/aws/logs_monitoring/tools/integration_tests/recorder/pb/trace_payload_pb2.py +++ b/aws/logs_monitoring/tools/integration_tests/recorder/pb/trace_payload_pb2.py @@ -1,39 +1,36 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: trace_payload.proto +# Protobuf Python Version: 5.28.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, 5, 28, 1, "", "trace_payload.proto" +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() + import trace_pb2 as trace__pb2 import span_pb2 as span__pb2 + DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( b'\n\x13trace_payload.proto\x12\x02pb\x1a\x0btrace.proto\x1a\nspan.proto"K\n\x0cTracePayload\x12\x10\n\x08hostName\x18\x01 \x01(\t\x12\x0b\n\x03\x65nv\x18\x02 \x01(\t\x12\x1c\n\x06traces\x18\x03 \x03(\x0b\x32\x0c.pb.APITraceb\x06proto3' ) - -_TRACEPAYLOAD = DESCRIPTOR.message_types_by_name["TracePayload"] -TracePayload = _reflection.GeneratedProtocolMessageType( - "TracePayload", - (_message.Message,), - { - "DESCRIPTOR": _TRACEPAYLOAD, - "__module__": "trace_payload_pb2", - # @@protoc_insertion_point(class_scope:pb.TracePayload) - }, -) -_sym_db.RegisterMessage(TracePayload) - -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _TRACEPAYLOAD._serialized_start = 52 - _TRACEPAYLOAD._serialized_end = 127 +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "trace_payload_pb2", _globals) +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals["_TRACEPAYLOAD"]._serialized_start = 52 + _globals["_TRACEPAYLOAD"]._serialized_end = 127 # @@protoc_insertion_point(module_scope) diff --git a/aws/logs_monitoring/tools/integration_tests/recorder/pb/trace_pb2.py b/aws/logs_monitoring/tools/integration_tests/recorder/pb/trace_pb2.py index 310f4c69..56e14313 100644 --- a/aws/logs_monitoring/tools/integration_tests/recorder/pb/trace_pb2.py +++ b/aws/logs_monitoring/tools/integration_tests/recorder/pb/trace_pb2.py @@ -1,38 +1,35 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: trace.proto +# Protobuf Python Version: 5.28.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, 5, 28, 1, "", "trace.proto" +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() + import span_pb2 as span__pb2 + DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( b'\n\x0btrace.proto\x12\x02pb\x1a\nspan.proto"X\n\x08\x41PITrace\x12\x0f\n\x07traceID\x18\x01 \x01(\x04\x12\x17\n\x05spans\x18\x02 \x03(\x0b\x32\x08.pb.Span\x12\x11\n\tstartTime\x18\x06 \x01(\x03\x12\x0f\n\x07\x65ndTime\x18\x07 \x01(\x03\x62\x06proto3' ) - -_APITRACE = DESCRIPTOR.message_types_by_name["APITrace"] -APITrace = _reflection.GeneratedProtocolMessageType( - "APITrace", - (_message.Message,), - { - "DESCRIPTOR": _APITRACE, - "__module__": "trace_pb2", - # @@protoc_insertion_point(class_scope:pb.APITrace) - }, -) -_sym_db.RegisterMessage(APITrace) - -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _APITRACE._serialized_start = 31 - _APITRACE._serialized_end = 119 +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "trace_pb2", _globals) +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals["_APITRACE"]._serialized_start = 31 + _globals["_APITRACE"]._serialized_end = 119 # @@protoc_insertion_point(module_scope) diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot index eebb6049..9d1445dc 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot @@ -10,15 +10,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:test-customized-loggroup,region:us-east-1,service:test-customized-loggroup", - "host": "arn:aws:lambda:us-east-1:0000000000:function:test-customized-loggroup", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:test-customized-loggroup,region:us-east-1,service:test-customized-loggroup", + "host": "arn:aws:lambda:us-east-1:012345678912:function:test-customized-loggroup", "id": "35311576111948622874033876462979853992919938886093242368", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:test-customized-loggroup" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:test-customized-loggroup" }, "message": "2020-03-05T16:30:36.113Z\t\tDEBUG\t[dd.trace_id=3172564172058669914 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:Patched console output with trace context\"}\n", "service": "test-customized-loggroup", @@ -32,15 +32,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:test-customized-loggroup,region:us-east-1,service:test-customized-loggroup", - "host": "arn:aws:lambda:us-east-1:0000000000:function:test-customized-loggroup", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:test-customized-loggroup,region:us-east-1,service:test-customized-loggroup", + "host": "arn:aws:lambda:us-east-1:012345678912:function:test-customized-loggroup", "id": "35311576111948622874033876462979853992919938886093242369", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:test-customized-loggroup" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:test-customized-loggroup" }, "message": "2020-03-05T16:30:36.114Z\t\tDEBUG\t[dd.trace_id=3172564172058669914 dd.span_id=14292093692483532556] {\"autoPatchHTTP\":true,\"tracerInitialized\":true,\"status\":\"debug\",\"message\":\"datadog:Not patching HTTP libraries\"}\n", "service": "test-customized-loggroup", @@ -54,15 +54,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:test-customized-loggroup,region:us-east-1,service:test-customized-loggroup", - "host": "arn:aws:lambda:us-east-1:0000000000:function:test-customized-loggroup", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:test-customized-loggroup,region:us-east-1,service:test-customized-loggroup", + "host": "arn:aws:lambda:us-east-1:012345678912:function:test-customized-loggroup", "id": "35311576111948622874033876462979853992919938886093242370", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:test-customized-loggroup" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:test-customized-loggroup" }, "message": "2020-03-05T16:30:36.114Z\t\tDEBUG\t[dd.trace_id=3172564172058669914 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:Reading trace context from env var Root=1-5e61292c-cc1229a4dfbeae1043928548;Parent=c657b77d9514f70c;Sampled=1\"}\n", "service": "test-customized-loggroup", @@ -80,11 +80,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -99,8 +100,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -113,8 +114,8 @@ "metric": "aws.dd_forwarder.list_tags_log_group_api_call", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -127,8 +128,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_write_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -141,8 +142,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -155,8 +156,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -169,8 +170,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -188,11 +189,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot index 6b391a14..fc4345f4 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot @@ -10,11 +10,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "cloudwatch", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "host": "testLogGroup", "id": "eventId1", "message": "[ERROR] First test message", @@ -29,11 +29,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "cloudwatch", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "host": "testLogGroup", "id": "eventId2", "message": "[ERROR] Second test message", @@ -52,11 +52,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -71,8 +72,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -85,8 +86,8 @@ "metric": "aws.dd_forwarder.list_tags_log_group_api_call", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -99,8 +100,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_write_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -113,8 +114,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -127,8 +128,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -141,8 +142,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -160,11 +161,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_apigateway.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_apigateway.json~snapshot index 53fe3e79..96774dca 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_apigateway.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_apigateway.json~snapshot @@ -10,11 +10,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "apigateway", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "eventId": "11111111111111111111111111111111", "host": "API-Gateway-Execution-Logs_xxxxxxxxxx/production", "ingestionTime": 1607444452966, @@ -31,11 +31,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "apigateway", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "eventId": "11111111111111111111111111111111", "host": "API-Gateway-Execution-Logs_xxxxxxxxxx/production", "ingestionTime": 1607444452966, @@ -52,11 +52,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "apigateway", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "eventId": "11111111111111111111111111111111", "host": "API-Gateway-Execution-Logs_xxxxxxxxxx/production", "ingestionTime": 1607444452966, @@ -77,11 +77,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -96,8 +97,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -110,8 +111,8 @@ "metric": "aws.dd_forwarder.list_tags_log_group_api_call", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -124,8 +125,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_write_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -138,8 +139,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -152,8 +153,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -166,8 +167,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -185,11 +186,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot index 5e5900ef..8bdd4e87 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot @@ -10,11 +10,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "cloudtrail", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "host": "aws-cloudtrail-logs-123456789123-c81b5193", "id": "35689263648391837472973739781728019701390240798247944192", "message": "{\"eventVersion\":\"1.05\",\"userIdentity\":{\"type\":\"AssumedRole\",\"principalId\":\"AROA55TKTI7VKCG3ZB64V:DatadogAWSIntegration\",\"arn\":\"arn:aws:sts::123456789123:assumed-role/DatadogAWSIntegrationRole/DatadogAWSIntegration\",\"accountId\":\"123456789123\",\"accessKeyId\":\"ASIA55TKTI7VANF3DEVD\",\"sessionContext\":{\"sessionIssuer\":{\"type\":\"Role\",\"principalId\":\"AROA55TKTI7VKCG3ZB64V\",\"arn\":\"arn:aws:iam::123456789123:role/DatadogAWSIntegrationRole\",\"accountId\":\"123456789123\",\"userName\":\"DatadogAWSIntegrationRole\"},\"webIdFederationData\":{},\"attributes\":{\"mfaAuthenticated\":\"false\",\"creationDate\":\"2020-09-17T16:29:28Z\"}}},\"eventTime\":\"2020-09-17T16:44:11Z\",\"eventSource\":\"logs.amazonaws.com\",\"eventName\":\"DescribeLogStreams\",\"awsRegion\":\"us-east-1\",\"sourceIPAddress\":\"54.161.67.200\",\"userAgent\":\"Datadog\",\"requestParameters\":{\"logGroupName\":\"/aws/lambda/hello-dog-node-dev-hello12x\",\"descending\":true,\"orderBy\":\"LastEventTime\"},\"responseElements\":null,\"requestID\":\"\",\"eventID\":\"\",\"eventType\":\"AwsApiCall\",\"apiVersion\":\"20140328\",\"recipientAccountId\":\"123456789123\"}", @@ -29,11 +29,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "cloudtrail", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "host": "aws-cloudtrail-logs-123456789123-c81b5193", "id": "35689263648391837472973739781728019701390240798247944193", "message": "{\"eventVersion\":\"1.05\",\"userIdentity\":{\"type\":\"Root\",\"principalId\":\"123456789123\",\"arn\":\"arn:aws:iam::123456789123:root\",\"accountId\":\"123456789123\",\"accessKeyId\":\"ASIA55TKTI7VJK52JDP3\",\"sessionContext\":{\"sessionIssuer\":{},\"webIdFederationData\":{},\"attributes\":{\"mfaAuthenticated\":\"false\",\"creationDate\":\"2020-09-17T14:19:46Z\"}}},\"eventTime\":\"2020-09-17T16:44:28Z\",\"eventSource\":\"health.amazonaws.com\",\"eventName\":\"DescribeEventAggregates\",\"awsRegion\":\"us-east-1\",\"sourceIPAddress\":\"68.194.150.7\",\"userAgent\":\"console.amazonaws.com\",\"requestParameters\":{\"aggregateField\":\"eventTypeCategory\",\"filter\":{\"eventStatusCodes\":[\"open\",\"upcoming\"],\"startTimes\":[{\"from\":\"Sep 10, 2020 4:44:28 PM\"}]}},\"responseElements\":null,\"requestID\":\"\",\"eventID\":\"\",\"eventType\":\"AwsApiCall\",\"recipientAccountId\":\"123456789123\"}", @@ -48,11 +48,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "cloudtrail", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "host": "aws-cloudtrail-logs-123456789123-c81b5193", "id": "35689263648391837472973739781728019701390240798247944194", "message": "{\"eventVersion\":\"1.05\",\"userIdentity\":{\"type\":\"AssumedRole\",\"principalId\":\"AROA55TKTI7VKCG3ZB64V:DatadogAWSIntegration\",\"arn\":\"arn:aws:sts::123456789123:assumed-role/DatadogAWSIntegrationRole/DatadogAWSIntegration\",\"accountId\":\"123456789123\",\"accessKeyId\":\"ASIA55TKTI7VANF3DEVD\",\"sessionContext\":{\"sessionIssuer\":{\"type\":\"Role\",\"principalId\":\"AROA55TKTI7VKCG3ZB64V\",\"arn\":\"arn:aws:iam::123456789123:role/DatadogAWSIntegrationRole\",\"accountId\":\"123456789123\",\"userName\":\"DatadogAWSIntegrationRole\"},\"webIdFederationData\":{},\"attributes\":{\"mfaAuthenticated\":\"false\",\"creationDate\":\"2020-09-17T16:29:28Z\"}}},\"eventTime\":\"2020-09-17T16:44:10Z\",\"eventSource\":\"logs.amazonaws.com\",\"eventName\":\"DescribeLogStreams\",\"awsRegion\":\"us-east-1\",\"sourceIPAddress\":\"54.161.67.200\",\"userAgent\":\"Datadog\",\"requestParameters\":{\"logGroupName\":\"/aws/lambda/hello-dog-node-dev-hello10x\",\"descending\":true,\"orderBy\":\"LastEventTime\"},\"responseElements\":null,\"requestID\":\"\",\"eventID\":\"\",\"eventType\":\"AwsApiCall\",\"apiVersion\":\"20140328\",\"recipientAccountId\":\"123456789123\"}", @@ -67,11 +67,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "cloudtrail", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "host": "i-08014e4f62ccf762d", "id": "35689263648391837472973739781728019701390240798247944195", "message": "{\"eventVersion\":\"1.05\",\"userIdentity\":{\"type\":\"AssumedRole\",\"principalId\":\"AROA55TKTI7VKCG3ZB64V:DatadogAWSIntegration\",\"arn\":\"arn:aws:sts::123456789123:assumed-role/DatadogAWSIntegrationRole/i-08014e4f62ccf762d\",\"accountId\":\"123456789123\",\"accessKeyId\":\"ASIA55TKTI7VANF3DEVD\",\"sessionContext\":{\"sessionIssuer\":{\"type\":\"Role\",\"principalId\":\"AROA55TKTI7VKCG3ZB64V\",\"arn\":\"arn:aws:iam::123456789123:role/DatadogAWSIntegrationRole\",\"accountId\":\"123456789123\",\"userName\":\"DatadogAWSIntegrationRole\"},\"webIdFederationData\":{},\"attributes\":{\"mfaAuthenticated\":\"false\",\"creationDate\":\"2020-09-17T16:29:28Z\"}}},\"eventTime\":\"2020-09-17T16:44:10Z\",\"eventSource\":\"logs.amazonaws.com\",\"eventName\":\"DescribeLogStreams\",\"awsRegion\":\"us-east-1\",\"sourceIPAddress\":\"54.161.67.200\",\"userAgent\":\"Datadog\",\"requestParameters\":{\"logGroupName\":\"/aws/lambda/hello-dog-node-dev-hello10x\",\"descending\":true,\"orderBy\":\"LastEventTime\"},\"responseElements\":null,\"requestID\":\"\",\"eventID\":\"\",\"eventType\":\"AwsApiCall\",\"apiVersion\":\"20140328\",\"recipientAccountId\":\"123456789123\"}", @@ -90,11 +90,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -109,8 +110,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -123,8 +124,8 @@ "metric": "aws.dd_forwarder.list_tags_log_group_api_call", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -137,8 +138,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_write_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -151,8 +152,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -165,8 +166,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -179,8 +180,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -198,11 +199,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot index bdbdcdab..006fa586 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot @@ -10,8 +10,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -24,8 +24,8 @@ "metric": "aws.dd_forwarder.list_tags_log_group_api_call", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -38,8 +38,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_write_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -52,8 +52,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -66,8 +66,8 @@ "metric": "aws.dd_forwarder.local_lambda_cache_expired", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -80,8 +80,8 @@ "metric": "aws.dd_forwarder.s3_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -94,8 +94,8 @@ "metric": "aws.dd_forwarder.s3_cache_expired", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -113,11 +113,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot index b8ddf6f9..376bd871 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot @@ -10,11 +10,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "cloudwatch", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,custom_tag1:value1,custom_tag2:value2", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,custom_tag1:value1,custom_tag2:value2", "host": "testLogGroup", "id": "eventId1", "message": "{\"message\": \"hello world\"}", @@ -33,11 +33,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -52,8 +53,8 @@ "metric": "aws.dd_forwarder.loggroup_local_cache_hit", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -66,8 +67,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -80,8 +81,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -94,8 +95,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -113,11 +114,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_fsx_windows.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_fsx_windows.json~snapshot index 65a71d1b..8146c7f4 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_fsx_windows.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_fsx_windows.json~snapshot @@ -10,11 +10,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "aws.fsx", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "host": "/aws/fsx/windows/12345", "id": "35689263648391837472973739781728019701390240798247944192", "message": "4663101280000x8020000000000000294054Securityamznfsxjgnfqf2v.fsx.demo.comS-1-5-21-1387100404-3545110199-3154596375-1113Adminfsx0xbc9cfccSecurityFile\\Device\\HarddiskVolume13\\share\\My first folder0x1350%%44230x800x4S:AI", @@ -33,11 +33,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -52,8 +53,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -66,8 +67,8 @@ "metric": "aws.dd_forwarder.list_tags_log_group_api_call", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -80,8 +81,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_write_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -94,8 +95,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -108,8 +109,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -122,8 +123,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -141,11 +142,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot index 03b92781..d517f804 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot @@ -10,15 +10,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576111948622874033876462979853992919938886093242368", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.113Z\t\tDEBUG\t[dd.trace_id=3172564172058669914 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:Patched console output with trace context\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -32,15 +32,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576111948622874033876462979853992919938886093242369", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.114Z\t\tDEBUG\t[dd.trace_id=3172564172058669914 dd.span_id=14292093692483532556] {\"autoPatchHTTP\":true,\"tracerInitialized\":true,\"status\":\"debug\",\"message\":\"datadog:Not patching HTTP libraries\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -54,15 +54,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576111948622874033876462979853992919938886093242370", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.114Z\t\tDEBUG\t[dd.trace_id=3172564172058669914 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:Reading trace context from env var Root=1-5e61292c-cc1229a4dfbeae1043928548;Parent=c657b77d9514f70c;Sampled=1\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -76,15 +76,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576111948622874033876462979853992919938886093242371", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.114Z\t\tDEBUG\t[dd.trace_id=3172564172058669914 dd.span_id=14292093692483532556] {\"parentID\":\"14292093692483532556\",\"sampleMode\":2,\"source\":\"xray\",\"traceID\":\"6899143064054564168\",\"status\":\"debug\",\"message\":\"datadog:read trace context from environment\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -98,15 +98,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576112305434797210366433244425485282312670188929029", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.130Z\t\tDEBUG\t[dd.trace_id=6899143064054564168 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:set trace context from xray with parent 14292093692483532556 from segment\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -120,15 +120,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576113197464605151591358905854216188247130428145670", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.131Z\t\tDEBUG\t[dd.trace_id=6899143064054564168 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:set trace context from xray with parent 14292093692483532556 from segment\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -142,15 +142,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576113197464605151591358905854216188247130428145671", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.131Z\t\tDEBUG\t[dd.trace_id=6899143064054564168 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:set trace context from xray with parent 14292093692483532556 from segment\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -164,15 +164,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576113197464605151591358905854216188247130428145672", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.131Z\t\tDEBUG\t[dd.trace_id=6899143064054564168 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:set trace context from xray with parent 14292093692483532556 from segment\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -186,15 +186,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576113197464605151591358905854216188247130428145673", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.131Z\t\tDEBUG\t[dd.trace_id=6899143064054564168 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:Attempting to find parent for datadog trace trace\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -208,15 +208,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576113197464605151591358905854216188247130428145674", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.131Z\t\tDEBUG\t[dd.trace_id=6899143064054564168 dd.span_id=14292093692483532556] {\"status\":\"debug\",\"message\":\"datadog:Applying lambda context to datadog traces\"}\n", "service": "hello-dog-node-dev-hello12x", @@ -230,15 +230,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576113643479509122203821736568581641214360547753995", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.172Z\t\tINFO\t[dd.trace_id=6899143064054564168 dd.span_id=2927617725217152879] Request Headers undefined\n", "service": "hello-dog-node-dev-hello12x", @@ -252,15 +252,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576113643479509122203821736568581641214360547753996", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.172Z\t\tINFO\t[dd.trace_id=6899143064054564168 dd.span_id=2927617725217152879] Root=1-5e61292c-cc1229a4dfbeae1043928548;Parent=c657b77d9514f70c;Sampled=1\n", "service": "hello-dog-node-dev-hello12x", @@ -274,15 +274,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576123455807396475678004012284621606493423179137038", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.592Z\t\tINFO\t[dd.trace_id=6899143064054564168 dd.span_id=3694123456155101779] 8103.047457805628\n", "service": "hello-dog-node-dev-hello12x", @@ -296,15 +296,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576123478108141674208627153820339879141784685117455", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "2020-03-05T16:30:36.631Z\t\tINFO\t[dd.trace_id=6899143064054564168 dd.span_id=2927617725217152879] Finishing Span\n", "service": "hello-dog-node-dev-hello12x", @@ -318,15 +318,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576126131896820299352780996570814324296803896786961", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "END RequestId: \n", "service": "hello-dog-node-dev-hello12x", @@ -340,15 +340,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", - "host": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "host": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", "id": "35311576126131896820299352780996570814324296803896786962", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x" }, "message": "REPORT RequestId: \tDuration: 619.31 ms\tBilled Duration: 700 ms\tMemory Size: 128 MB\tMax Memory Used: 118 MB\t\nXRAY TraceId: 1-5e61292c-cc1229a4dfbeae1043928548\tSegmentId: 07a85e713f6302b2\tSampled: true\t\n", "service": "hello-dog-node-dev-hello12x", @@ -366,11 +366,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -386,11 +387,11 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", - "forwarder_memorysize": "1536", + "account_id": "012345678912", + "aws_account": "012345678912", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "language": "javascript", "region": "us-east-1" @@ -412,11 +413,11 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", - "forwarder_memorysize": "1536", + "account_id": "012345678912", + "aws_account": "012345678912", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "language": "javascript", "region": "us-east-1" @@ -438,11 +439,11 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", - "forwarder_memorysize": "1536", + "account_id": "012345678912", + "aws_account": "012345678912", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "language": "javascript", "region": "us-east-1" @@ -464,11 +465,11 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", - "forwarder_memorysize": "1536", + "account_id": "012345678912", + "aws_account": "012345678912", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "language": "javascript", "region": "us-east-1" @@ -490,11 +491,11 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", - "forwarder_memorysize": "1536", + "account_id": "012345678912", + "aws_account": "012345678912", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "language": "javascript", "region": "us-east-1" @@ -516,11 +517,11 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", - "forwarder_memorysize": "1536", + "account_id": "012345678912", + "aws_account": "012345678912", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "language": "javascript", "region": "us-east-1" @@ -542,13 +543,13 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", + "account_id": "012345678912", + "aws_account": "012345678912", "dns.address": "0.0.0.0", "dns.hostname": "0.0.0.0", - "forwarder_memorysize": "1536", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "region": "us-east-1", "span.kind": "client" @@ -571,13 +572,13 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", + "account_id": "012345678912", + "aws_account": "012345678912", "dns.address": "169.254.79.2", "dns.hostname": "169.254.79.2", - "forwarder_memorysize": "1536", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "region": "us-east-1", "span.kind": "client" @@ -600,13 +601,13 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", + "account_id": "012345678912", + "aws_account": "012345678912", "dns.address": "172.217.15.68", "dns.hostname": "www.google.com", - "forwarder_memorysize": "1536", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "region": "us-east-1", "span.kind": "client" @@ -630,11 +631,11 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", - "forwarder_memorysize": "1536", + "account_id": "012345678912", + "aws_account": "012345678912", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "out.host": "www.google.com", "out.port": "443", @@ -667,11 +668,11 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", - "forwarder_memorysize": "1536", + "account_id": "012345678912", + "aws_account": "012345678912", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "functionname": "hello-dog-node-dev-hello12x", "http.method": "GET", "http.status_code": "200", @@ -703,12 +704,12 @@ "meta": { "_dd.compute_stats": "1", "_dd.origin": "lambda", - "account_id": "0000000000", - "aws_account": "0000000000", + "account_id": "012345678912", + "aws_account": "012345678912", "cold_start": "false", - "forwarder_memorysize": "1536", + "forwarder_memorysize": "3008", "forwarder_version": "", - "forwardername": "test", + "forwardername": "test_function", "function_arn": "arn:aws:lambda:us-east-1:601427279990:function:hello-dog-node-dev-hello12x", "functionname": "hello-dog-node-dev-hello12x", "language": "javascript", @@ -763,8 +764,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -777,8 +778,8 @@ "metric": "aws.dd_forwarder.list_tags_log_group_api_call", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -791,8 +792,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_write_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -805,8 +806,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -819,8 +820,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -833,8 +834,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -847,8 +848,8 @@ "metric": "aws.dd_forwarder.traces_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -867,13 +868,13 @@ "cold_start:false", "memorysize:128", "runtime:nodejs12.x", - "function_arn:arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", - "forwardername:test", - "forwarder_memorysize:1536", + "function_arn:arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "env:none", - "account_id:0000000000", - "aws_account:0000000000", + "account_id:012345678912", + "aws_account:012345678912", "functionname:hello-dog-node-dev-hello12x", "region:us-east-1", "service:hello-dog-node-dev-hello12x" @@ -888,13 +889,13 @@ "points": "", "tags": [ "dd_lambda_layer:datadog-nodev12.14.1", - "function_arn:arn:aws:lambda:us-east-1:0000000000:function:hello-dog-node-dev-hello12x", - "forwardername:test", - "forwarder_memorysize:1536", + "function_arn:arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "env:none", - "account_id:0000000000", - "aws_account:0000000000", + "account_id:012345678912", + "aws_account:012345678912", "functionname:hello-dog-node-dev-hello12x", "region:us-east-1", "service:hello-dog-node-dev-hello12x" @@ -911,8 +912,8 @@ "memorysize:128", "cold_start:false", "region:us-east-1", - "account_id:0000000000", - "aws_account:0000000000", + "account_id:012345678912", + "aws_account:012345678912", "functionname:hello-dog-node-dev-hello12x" ], "type": "distribution" @@ -927,8 +928,8 @@ "memorysize:128", "cold_start:false", "region:us-east-1", - "account_id:0000000000", - "aws_account:0000000000", + "account_id:012345678912", + "aws_account:012345678912", "functionname:hello-dog-node-dev-hello12x" ], "type": "distribution" @@ -943,8 +944,8 @@ "memorysize:128", "cold_start:false", "region:us-east-1", - "account_id:0000000000", - "aws_account:0000000000", + "account_id:012345678912", + "aws_account:012345678912", "functionname:hello-dog-node-dev-hello12x" ], "type": "distribution" @@ -959,8 +960,8 @@ "memorysize:128", "cold_start:false", "region:us-east-1", - "account_id:0000000000", - "aws_account:0000000000", + "account_id:012345678912", + "aws_account:012345678912", "functionname:hello-dog-node-dev-hello12x" ], "type": "distribution" @@ -977,11 +978,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_route53.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_route53.json~snapshot index 1f83b994..9205aa21 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_route53.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_route53.json~snapshot @@ -10,11 +10,11 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "route53", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "host": "i-090384b04e4e5bfd2", "id": "36101011026851289935914250459116581911799633971817938944", "message": "{\"version\":\"1.100000\",\"account_id\":\"601427279990\",\"region\":\"us-east-1\",\"vpc_id\":\"vpc-34d4ae52\",\"query_timestamp\":\"2021-04-19T09:42:02Z\",\"query_name\":\"queue.amazonaws.com.\",\"query_type\":\"A\",\"query_class\":\"IN\",\"rcode\":\"NOERROR\",\"answers\":[{\"Rdata\":\"3.236.169.0\",\"Type\":\"A\",\"Class\":\"IN\"}],\"srcaddr\":\"172.31.26.215\",\"srcport\":\"34460\",\"transport\":\"UDP\",\"srcids\":{\"instance\":\"i-090384b04e4e5bfd2\"}}", @@ -33,11 +33,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -52,8 +53,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -66,8 +67,8 @@ "metric": "aws.dd_forwarder.list_tags_log_group_api_call", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -80,8 +81,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_write_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -94,8 +95,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -108,8 +109,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -122,8 +123,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -141,11 +142,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot index 80801912..b4af08d9 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot @@ -10,11 +10,11 @@ "owner": "123456789123" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "cloudwatch", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,service:myservice", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,service:myservice", "host": "testLogGroup", "id": "eventId1", "message": "{\"message\": \"hello world\"}", @@ -33,11 +33,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -52,8 +53,8 @@ "metric": "aws.dd_forwarder.loggroup_local_cache_hit", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -66,8 +67,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -80,8 +81,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -94,8 +95,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -113,11 +114,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot index 8077770d..91a7bdc2 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot @@ -10,15 +10,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", - "host": "arn:aws:lambda:us-east-1:0000000000:function:storms-cloudwatch-event", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "host": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event", "id": "35496429375792603298393743017356257146982675867810398208", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:storms-cloudwatch-event" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event" }, "message": "START RequestId: Version: $LATEST\\n", "service": "storms-cloudwatch-event", @@ -32,15 +32,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", - "host": "arn:aws:lambda:us-east-1:0000000000:function:storms-cloudwatch-event", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "host": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event", "id": "35496429442806342619978265557671090556291002193281548289", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:storms-cloudwatch-event" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event" }, "message": "END RequestId: \\n", "service": "storms-cloudwatch-event", @@ -54,15 +54,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", - "host": "arn:aws:lambda:us-east-1:0000000000:function:storms-cloudwatch-event", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "host": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event", "id": "35496429442806342619978265557671090556291002193281548290", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:storms-cloudwatch-event" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event" }, "message": "REPORT RequestId: \\tDuration: 3003.16 ms\\tBilled Duration: 3000 ms\\tMemory Size: 128 MB\\tMax Memory Used: 48 MB\\tInit Duration: 127.02 ms\\t\\n", "service": "storms-cloudwatch-event", @@ -76,15 +76,15 @@ "owner": "601427279990" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "lambda", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0000000000,aws_account:0000000000,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", - "host": "arn:aws:lambda:us-east-1:0000000000:function:storms-cloudwatch-event", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:,env:none,account_id:012345678912,aws_account:012345678912,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "host": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event", "id": "35496429442806342619978265557671090556291002193281548291", "lambda": { - "arn": "arn:aws:lambda:us-east-1:0000000000:function:storms-cloudwatch-event" + "arn": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event" }, "message": "2020-06-09T15:02:26.150Z Task timed out after 3.00 seconds\\n\\n", "service": "storms-cloudwatch-event", @@ -102,11 +102,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -121,8 +122,8 @@ "metric": "aws.dd_forwarder.loggroup_local_cache_hit", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -135,8 +136,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -149,8 +150,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -163,8 +164,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -178,8 +179,8 @@ "points": "", "tags": [ "region:us-east-1", - "account_id:0000000000", - "aws_account:0000000000", + "account_id:012345678912", + "aws_account:012345678912", "functionname:storms-cloudwatch-event" ], "type": "distribution" @@ -196,11 +197,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot index 5e389db7..545fa2d5 100644 --- a/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot +++ b/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot @@ -10,11 +10,11 @@ "owner": "425362996713" }, "function_version": "$LATEST", - "invoked_function_arn": "arn:aws:lambda:us-east-1:0000000000:function:test" + "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function" }, "ddsource": "stepfunction", "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", + "ddtags": "forwardername:test_function,forwarder_memorysize:3008,forwarder_version:", "host": "/aws/vendedlogs/states/logs-to-traces-sequential-Logs", "id": "37199773595581154154810589279545129148442535997644275712", "message": "{\"id\":\"1\",\"type\":\"ExecutionStarted\",\"details\":{\"input\":\"{\"Comment\": \"Insert your JSON here\"}\",\"inputDetails\":{\"truncated\":false},\"roleArn\":\"arn:aws:iam::425362996713:role/service-role/StepFunctions-logs-to-traces-sequential-role-ccd69c03\"},\",previous_event_id\":\"0\",\"event_timestamp\":\"1668095539607\",\"execution_arn\":\"arn:aws:states:sa-east-1:425362996713:express:logs-to-traces-sequential::\"}", @@ -33,11 +33,12 @@ "DD-EVP-ORIGIN-VERSION": "", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v2/logs", "verb": "POST" @@ -52,8 +53,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -66,8 +67,8 @@ "metric": "aws.dd_forwarder.list_tags_log_group_api_call", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -80,8 +81,8 @@ "metric": "aws.dd_forwarder.loggroup_cache_write_failure", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -94,8 +95,8 @@ "metric": "aws.dd_forwarder.incoming_events", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -108,8 +109,8 @@ "metric": "aws.dd_forwarder.logs_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -122,8 +123,8 @@ "metric": "aws.dd_forwarder.metrics_forwarded", "points": "", "tags": [ - "forwardername:test", - "forwarder_memorysize:1536", + "forwardername:test_function", + "forwarder_memorysize:3008", "forwarder_version:", "event_type:awslogs" ], @@ -141,11 +142,12 @@ "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345", "Host": "recorder:8080", "User-Agent": "", - "traceparent": "00-0000000000000000433534434534ef0d-91ed514f1e5c03b2-01", - "tracestate": "dd=s:2", + "traceparent": "", + "tracestate": "", "x-datadog-parent-id": "", - "x-datadog-sampling-priority": "2", - "x-datadog-trace-id": "4842834437835386637" + "x-datadog-sampling-priority": "1", + "x-datadog-tags": "", + "x-datadog-trace-id": "" }, "path": "/api/v1/distribution_points", "verb": "POST" diff --git a/aws/logs_monitoring/tools/integration_tests/tester/test_snapshots.py b/aws/logs_monitoring/tools/integration_tests/tester/test_snapshots.py index 6ec16dc6..a0da7344 100644 --- a/aws/logs_monitoring/tools/integration_tests/tester/test_snapshots.py +++ b/aws/logs_monitoring/tools/integration_tests/tester/test_snapshots.py @@ -54,6 +54,14 @@ def filter_data(self, data): event["headers"]["x-datadog-parent-id"] = "" if "Content-Length" in event["headers"]: event["headers"]["Content-Length"] = "" + if "x-datadog-trace-id" in event["headers"]: + event["headers"]["x-datadog-trace-id"] = "" + if "x-datadog-tags" in event["headers"]: + event["headers"]["x-datadog-tags"] = "" + if "traceparent" in event["headers"]: + event["headers"]["traceparent"] = "" + if "tracestate" in event["headers"]: + event["headers"]["tracestate"] = "" editedData["events"].append(event) return editedData @@ -115,14 +123,13 @@ def setUp(self): # Clears any previously recorded state self.get_recording() - # If this is the first test we are running, we first need to capture - # startup http calls like /validate + # Itests will directly call the forwarder handler which is datadog_forwarder() in lambda_function.py if not self.__class__.recorder_has_been_initialized: self.send_log_event("{}") recording = self.get_recording() self.assertEqual( recording["events"][0]["path"], - "/api/v1/validate?api_key=abcdefghijklmnopqrstuvwxyz012345", + "/api/v2/logs", ) self.__class__.recorder_has_been_initialized = True diff --git a/aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh b/aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh index 1761f428..969a08dd 100755 --- a/aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh +++ b/aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh @@ -17,7 +17,7 @@ rm -rf ./bin # between different python runtimes. if [[ $(docker image ls | grep -c datadog-go-layer) -lt 1 ]]; then - docker buildx build --platform linux/amd64 -t datadog-go-layer . --no-cache --build-arg "runtime=python:3.7" + docker buildx build --platform linux/amd64 -t datadog-go-layer . --no-cache --build-arg "runtime=python:3.12" fi id=$(docker create --platform linux/amd64 datadog-go-layer) diff --git a/aws/logs_monitoring/trace_forwarder/scripts/run_tests.sh b/aws/logs_monitoring/trace_forwarder/scripts/run_tests.sh index efd5e889..4ba88503 100755 --- a/aws/logs_monitoring/trace_forwarder/scripts/run_tests.sh +++ b/aws/logs_monitoring/trace_forwarder/scripts/run_tests.sh @@ -11,5 +11,5 @@ set -e # Change to the parent of the directory this script is in cd $(dirname "$0")/.. -docker buildx build --platform linux/amd64 -t datadog-go-layer . --build-arg runtime=python:3.7 +docker buildx build --platform linux/amd64 -t datadog-go-layer . --build-arg runtime=python:3.12 docker run --rm datadog-go-layer go test -v ./...