diff --git a/.github/workflows/apps/go.mod b/.github/workflows/apps/go.mod index 6ec9df957df..a031ce10aff 100644 --- a/.github/workflows/apps/go.mod +++ b/.github/workflows/apps/go.mod @@ -8,7 +8,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/.github/workflows/apps/go.sum b/.github/workflows/apps/go.sum index e777e51f7ce..55972012fc2 100644 --- a/.github/workflows/apps/go.sum +++ b/.github/workflows/apps/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/99designs/gqlgen/go.mod b/contrib/99designs/gqlgen/go.mod index f46ed9a17fd..01095198aa8 100644 --- a/contrib/99designs/gqlgen/go.mod +++ b/contrib/99designs/gqlgen/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/99designs/gqlgen/go.sum b/contrib/99designs/gqlgen/go.sum index 8088cfc8ffa..9567c44f40c 100644 --- a/contrib/99designs/gqlgen/go.sum +++ b/contrib/99designs/gqlgen/go.sum @@ -1,7 +1,7 @@ github.com/99designs/gqlgen v0.17.36 h1:u/o/rv2SZ9s5280dyUOOrkpIIkr/7kITMXYD3rkJ9go= github.com/99designs/gqlgen v0.17.36/go.mod h1:6RdyY8puhCoWAQVr2qzF2OMVfudQzc8ACxzpzluoQm4= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/IBM/sarama/go.mod b/contrib/IBM/sarama/go.mod index 97af919e37d..9e6efab484a 100644 --- a/contrib/IBM/sarama/go.mod +++ b/contrib/IBM/sarama/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/IBM/sarama/go.sum b/contrib/IBM/sarama/go.sum index 4005ea6dfc6..2c1ac299ba5 100644 --- a/contrib/IBM/sarama/go.sum +++ b/contrib/IBM/sarama/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/Shopify/sarama/go.mod b/contrib/Shopify/sarama/go.mod index 7a6fad74c03..52dcacc8970 100644 --- a/contrib/Shopify/sarama/go.mod +++ b/contrib/Shopify/sarama/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/Shopify/sarama/go.sum b/contrib/Shopify/sarama/go.sum index ccbf5b6cbfc..60be3b3bb12 100644 --- a/contrib/Shopify/sarama/go.sum +++ b/contrib/Shopify/sarama/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/aws/aws-sdk-go-v2/go.mod b/contrib/aws/aws-sdk-go-v2/go.mod index 60cc257087a..cf21fd08fd5 100644 --- a/contrib/aws/aws-sdk-go-v2/go.mod +++ b/contrib/aws/aws-sdk-go-v2/go.mod @@ -19,7 +19,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/aws/aws-sdk-go-v2/go.sum b/contrib/aws/aws-sdk-go-v2/go.sum index c9e169ebcce..a48fdd158cc 100644 --- a/contrib/aws/aws-sdk-go-v2/go.sum +++ b/contrib/aws/aws-sdk-go-v2/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/aws/aws-sdk-go/go.mod b/contrib/aws/aws-sdk-go/go.mod index 75e3e4281bb..c77ff234556 100644 --- a/contrib/aws/aws-sdk-go/go.mod +++ b/contrib/aws/aws-sdk-go/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/aws/aws-sdk-go/go.sum b/contrib/aws/aws-sdk-go/go.sum index 2b599264e7a..c04105ec365 100644 --- a/contrib/aws/aws-sdk-go/go.sum +++ b/contrib/aws/aws-sdk-go/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/bradfitz/gomemcache/go.mod b/contrib/bradfitz/gomemcache/go.mod index d118e6a54a0..5748c67b1e7 100644 --- a/contrib/bradfitz/gomemcache/go.mod +++ b/contrib/bradfitz/gomemcache/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/bradfitz/gomemcache/go.sum b/contrib/bradfitz/gomemcache/go.sum index 07d03cc7a8b..ce0a2a2fc40 100644 --- a/contrib/bradfitz/gomemcache/go.sum +++ b/contrib/bradfitz/gomemcache/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/cloud.google.com/go/pubsub.v1/go.mod b/contrib/cloud.google.com/go/pubsub.v1/go.mod index 13efea22440..5f098e11264 100644 --- a/contrib/cloud.google.com/go/pubsub.v1/go.mod +++ b/contrib/cloud.google.com/go/pubsub.v1/go.mod @@ -14,7 +14,7 @@ require ( cloud.google.com/go v0.112.1 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.1.7 // indirect - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/cloud.google.com/go/pubsub.v1/go.sum b/contrib/cloud.google.com/go/pubsub.v1/go.sum index b5e6d8fc144..a2a4a871696 100644 --- a/contrib/cloud.google.com/go/pubsub.v1/go.sum +++ b/contrib/cloud.google.com/go/pubsub.v1/go.sum @@ -10,8 +10,8 @@ cloud.google.com/go/kms v1.15.8/go.mod h1:WoUHcDjD9pluCg7pNds131awnH429QGvRM3N/4 cloud.google.com/go/pubsub v1.37.0 h1:0uEEfaB1VIJzabPpwpZf44zWAKAme3zwKKxHk7vJQxQ= cloud.google.com/go/pubsub v1.37.0/go.mod h1:YQOQr1uiUM092EXwKs56OPT650nwnawc+8/IjoUeGzQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/confluentinc/confluent-kafka-go/kafka.v2/go.mod b/contrib/confluentinc/confluent-kafka-go/kafka.v2/go.mod index 8d501ae8041..3c6a3466f78 100644 --- a/contrib/confluentinc/confluent-kafka-go/kafka.v2/go.mod +++ b/contrib/confluentinc/confluent-kafka-go/kafka.v2/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/confluentinc/confluent-kafka-go/kafka.v2/go.sum b/contrib/confluentinc/confluent-kafka-go/kafka.v2/go.sum index 303c9980d7a..fab272b52c9 100644 --- a/contrib/confluentinc/confluent-kafka-go/kafka.v2/go.sum +++ b/contrib/confluentinc/confluent-kafka-go/kafka.v2/go.sum @@ -6,8 +6,8 @@ github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkk github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/confluentinc/confluent-kafka-go/kafka/go.mod b/contrib/confluentinc/confluent-kafka-go/kafka/go.mod index cdab7b140aa..f7f607fd927 100644 --- a/contrib/confluentinc/confluent-kafka-go/kafka/go.mod +++ b/contrib/confluentinc/confluent-kafka-go/kafka/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/confluentinc/confluent-kafka-go/kafka/go.sum b/contrib/confluentinc/confluent-kafka-go/kafka/go.sum index c6d09376d8a..0ebc797f909 100644 --- a/contrib/confluentinc/confluent-kafka-go/kafka/go.sum +++ b/contrib/confluentinc/confluent-kafka-go/kafka/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/database/sql/go.mod b/contrib/database/sql/go.mod index 182c89fcfdd..ee9dfa7471b 100644 --- a/contrib/database/sql/go.mod +++ b/contrib/database/sql/go.mod @@ -16,7 +16,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/database/sql/go.sum b/contrib/database/sql/go.sum index acca42368d3..fdf3789b910 100644 --- a/contrib/database/sql/go.sum +++ b/contrib/database/sql/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/dimfeld/httptreemux.v5/go.mod b/contrib/dimfeld/httptreemux.v5/go.mod index 2fb858e97a6..a9a1df38fc6 100644 --- a/contrib/dimfeld/httptreemux.v5/go.mod +++ b/contrib/dimfeld/httptreemux.v5/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/dimfeld/httptreemux.v5/go.sum b/contrib/dimfeld/httptreemux.v5/go.sum index c3f65197ad8..15bb69e022c 100644 --- a/contrib/dimfeld/httptreemux.v5/go.sum +++ b/contrib/dimfeld/httptreemux.v5/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/dimfeld/httptreemux.v5/httptreemux.go b/contrib/dimfeld/httptreemux.v5/httptreemux.go index 401e929c4a1..8bfcec19c5b 100644 --- a/contrib/dimfeld/httptreemux.v5/httptreemux.go +++ b/contrib/dimfeld/httptreemux.v5/httptreemux.go @@ -52,10 +52,11 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) { route, _ := getRoute(r.TreeMux, w, req) // pass r.TreeMux to avoid a circular reference panic on calling r.ServeHTTP httptrace.TraceAndServe(r.TreeMux, w, req, &httptrace.ServeConfig{ - Service: r.config.serviceName, - Resource: resource, - SpanOpts: r.config.spanOpts, - Route: route, + Framework: "github.com/dimfeld/httptreemux/v5", + Service: r.config.serviceName, + Resource: resource, + SpanOpts: r.config.spanOpts, + Route: route, }) } @@ -87,10 +88,11 @@ func (r *ContextRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) { route, _ := getRoute(r.TreeMux, w, req) // pass r.TreeMux to avoid a circular reference panic on calling r.ServeHTTP httptrace.TraceAndServe(r.TreeMux, w, req, &httptrace.ServeConfig{ - Service: r.config.serviceName, - Resource: resource, - SpanOpts: r.config.spanOpts, - Route: route, + Framework: "github.com/dimfeld/httptreemux/v5", + Service: r.config.serviceName, + Resource: resource, + SpanOpts: r.config.spanOpts, + Route: route, }) } diff --git a/contrib/elastic/go-elasticsearch.v6/go.mod b/contrib/elastic/go-elasticsearch.v6/go.mod index 06639f306cd..db185bd8068 100644 --- a/contrib/elastic/go-elasticsearch.v6/go.mod +++ b/contrib/elastic/go-elasticsearch.v6/go.mod @@ -11,7 +11,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/elastic/go-elasticsearch.v6/go.sum b/contrib/elastic/go-elasticsearch.v6/go.sum index 57e88509be7..29880b0c7fc 100644 --- a/contrib/elastic/go-elasticsearch.v6/go.sum +++ b/contrib/elastic/go-elasticsearch.v6/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/emicklei/go-restful.v3/go.mod b/contrib/emicklei/go-restful.v3/go.mod index 893bdc8dc23..4f4bd2727fb 100644 --- a/contrib/emicklei/go-restful.v3/go.mod +++ b/contrib/emicklei/go-restful.v3/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/emicklei/go-restful.v3/go.sum b/contrib/emicklei/go-restful.v3/go.sum index cc28148630b..bca21c613bc 100644 --- a/contrib/emicklei/go-restful.v3/go.sum +++ b/contrib/emicklei/go-restful.v3/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/envoyproxy/go-control-plane/envoy.go b/contrib/envoyproxy/go-control-plane/envoy.go index 50170eefe0d..76614a77dba 100644 --- a/contrib/envoyproxy/go-control-plane/envoy.go +++ b/contrib/envoyproxy/go-control-plane/envoy.go @@ -217,7 +217,8 @@ func processRequestHeaders(ctx context.Context, req *envoyextproc.ProcessingRequ var blocked bool fakeResponseWriter := newFakeResponseWriter() wrappedResponseWriter, request, afterHandle, blocked := httptrace.BeforeHandle(&httptrace.ServeConfig{ - Resource: request.Method + " " + path.Clean(request.URL.Path), + Framework: "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3", + Resource: request.Method + " " + path.Clean(request.URL.Path), SpanOpts: []tracer.StartSpanOption{ tracer.Tag(ext.SpanKind, ext.SpanKindServer), tracer.Tag(ext.Component, spanComponentName), diff --git a/contrib/envoyproxy/go-control-plane/go.mod b/contrib/envoyproxy/go-control-plane/go.mod index 70332bf740c..c5c59071a1f 100644 --- a/contrib/envoyproxy/go-control-plane/go.mod +++ b/contrib/envoyproxy/go-control-plane/go.mod @@ -13,7 +13,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/envoyproxy/go-control-plane/go.sum b/contrib/envoyproxy/go-control-plane/go.sum index a39ae860c47..223164aeec7 100644 --- a/contrib/envoyproxy/go-control-plane/go.sum +++ b/contrib/envoyproxy/go-control-plane/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/gin-gonic/gin/appsec.go b/contrib/gin-gonic/gin/appsec.go index 9c679cddf13..431482410c9 100644 --- a/contrib/gin-gonic/gin/appsec.go +++ b/contrib/gin-gonic/gin/appsec.go @@ -28,6 +28,8 @@ func useAppSec(c *gin.Context, span trace.TagSetter) { c.Next() }) httpsec.WrapHandler(httpWrapper, span, params, &httpsec.Config{ - OnBlock: []func(){func() { c.Abort() }}, + Framework: "github.com/gin-gonic/gin", + OnBlock: []func(){func() { c.Abort() }}, + RouteForRequest: func(*http.Request) string { return c.FullPath() }, }).ServeHTTP(c.Writer, c.Request) } diff --git a/contrib/gin-gonic/gin/go.mod b/contrib/gin-gonic/gin/go.mod index e6bb1578bee..7db99a20285 100644 --- a/contrib/gin-gonic/gin/go.mod +++ b/contrib/gin-gonic/gin/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/gin-gonic/gin/go.sum b/contrib/gin-gonic/gin/go.sum index 73d7df010f2..bfca4be75f0 100644 --- a/contrib/gin-gonic/gin/go.sum +++ b/contrib/gin-gonic/gin/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/globalsign/mgo/go.mod b/contrib/globalsign/mgo/go.mod index 93ebf482667..c5a87724dba 100644 --- a/contrib/globalsign/mgo/go.mod +++ b/contrib/globalsign/mgo/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/globalsign/mgo/go.sum b/contrib/globalsign/mgo/go.sum index 3b7466bf3d0..85ffb9bcc2c 100644 --- a/contrib/globalsign/mgo/go.sum +++ b/contrib/globalsign/mgo/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/go-chi/chi.v5/chi.go b/contrib/go-chi/chi.v5/chi.go index 1242f8b6116..f77ecfd1b39 100644 --- a/contrib/go-chi/chi.v5/chi.go +++ b/contrib/go-chi/chi.v5/chi.go @@ -16,7 +16,6 @@ import ( "github.com/DataDog/dd-trace-go/v2/instrumentation/httptrace" "github.com/DataDog/dd-trace-go/v2/instrumentation/options" - "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" ) @@ -70,7 +69,7 @@ func Middleware(opts ...Option) func(next http.Handler) http.Handler { // pass the span through the request context and serve the request to the next middleware next.ServeHTTP(ww, r) - routePattern := cfg.modifyResourceName(chi.RouteContext(r.Context()).RoutePattern()) + routePattern := cfg.appsecConfig.RouteForRequest(r) span.SetTag(ext.HTTPRoute, routePattern) var resourceName string if cfg.resourceNamer != nil { diff --git a/contrib/go-chi/chi.v5/go.mod b/contrib/go-chi/chi.v5/go.mod index 704dad2baf9..58ba5dac380 100644 --- a/contrib/go-chi/chi.v5/go.mod +++ b/contrib/go-chi/chi.v5/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/go-chi/chi.v5/go.sum b/contrib/go-chi/chi.v5/go.sum index 48780455293..4f6c07a045e 100644 --- a/contrib/go-chi/chi.v5/go.sum +++ b/contrib/go-chi/chi.v5/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/go-chi/chi.v5/option.go b/contrib/go-chi/chi.v5/option.go index f26ab804891..8ca70ccc425 100644 --- a/contrib/go-chi/chi.v5/option.go +++ b/contrib/go-chi/chi.v5/option.go @@ -12,6 +12,7 @@ import ( "github.com/DataDog/dd-trace-go/v2/ddtrace/tracer" "github.com/DataDog/dd-trace-go/v2/instrumentation" "github.com/DataDog/dd-trace-go/v2/instrumentation/appsec/emitter/httpsec" + "github.com/go-chi/chi/v5" ) type config struct { @@ -48,6 +49,11 @@ func defaults(cfg *config) { // for backward compatibility with modifyResourceName, initialize resourceName as nil. cfg.resourceNamer = nil cfg.appsecDisabled = false + + cfg.appsecConfig.Framework = "github.com/go-chi/chi/v5" + cfg.appsecConfig.RouteForRequest = func(r *http.Request) string { + return cfg.modifyResourceName(chi.RouteContext(r.Context()).RoutePattern()) + } } // WithService sets the given service name for the router. diff --git a/contrib/go-chi/chi/go.mod b/contrib/go-chi/chi/go.mod index 409bf794b8d..919b69bbd3e 100644 --- a/contrib/go-chi/chi/go.mod +++ b/contrib/go-chi/chi/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/go-chi/chi/go.sum b/contrib/go-chi/chi/go.sum index a159a2d848e..a7e0cd63bc3 100644 --- a/contrib/go-chi/chi/go.sum +++ b/contrib/go-chi/chi/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/go-pg/pg.v10/go.mod b/contrib/go-pg/pg.v10/go.mod index d44f9c863a8..1a9730b28c6 100644 --- a/contrib/go-pg/pg.v10/go.mod +++ b/contrib/go-pg/pg.v10/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/go-pg/pg.v10/go.sum b/contrib/go-pg/pg.v10/go.sum index 4a7b8cee5e0..ec78babe00d 100644 --- a/contrib/go-pg/pg.v10/go.sum +++ b/contrib/go-pg/pg.v10/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/go-redis/redis.v7/go.mod b/contrib/go-redis/redis.v7/go.mod index 6ff247ffcc0..4f366000d34 100644 --- a/contrib/go-redis/redis.v7/go.mod +++ b/contrib/go-redis/redis.v7/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/go-redis/redis.v7/go.sum b/contrib/go-redis/redis.v7/go.sum index f4f1d231f10..36a6d1cc6b1 100644 --- a/contrib/go-redis/redis.v7/go.sum +++ b/contrib/go-redis/redis.v7/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/go-redis/redis.v8/go.mod b/contrib/go-redis/redis.v8/go.mod index e1209f7eec0..533e05c1898 100644 --- a/contrib/go-redis/redis.v8/go.mod +++ b/contrib/go-redis/redis.v8/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/go-redis/redis.v8/go.sum b/contrib/go-redis/redis.v8/go.sum index 3ec661a8ee6..6322adb2883 100644 --- a/contrib/go-redis/redis.v8/go.sum +++ b/contrib/go-redis/redis.v8/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/go-redis/redis/go.mod b/contrib/go-redis/redis/go.mod index 68f9cd164cd..b95434f6855 100644 --- a/contrib/go-redis/redis/go.mod +++ b/contrib/go-redis/redis/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/go-redis/redis/go.sum b/contrib/go-redis/redis/go.sum index fd9a5de464f..145ac6f1cca 100644 --- a/contrib/go-redis/redis/go.sum +++ b/contrib/go-redis/redis/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/go.mongodb.org/mongo-driver/go.mod b/contrib/go.mongodb.org/mongo-driver/go.mod index 7978c90f271..4b14e7fbb52 100644 --- a/contrib/go.mongodb.org/mongo-driver/go.mod +++ b/contrib/go.mongodb.org/mongo-driver/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/go.mongodb.org/mongo-driver/go.sum b/contrib/go.mongodb.org/mongo-driver/go.sum index fe428ee3f03..1115c491efe 100644 --- a/contrib/go.mongodb.org/mongo-driver/go.sum +++ b/contrib/go.mongodb.org/mongo-driver/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/gocql/gocql/go.mod b/contrib/gocql/gocql/go.mod index a9747e7ba58..4ab520c49f1 100644 --- a/contrib/gocql/gocql/go.mod +++ b/contrib/gocql/gocql/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/gocql/gocql/go.sum b/contrib/gocql/gocql/go.sum index 26f691676b1..70e33e28dc1 100644 --- a/contrib/gocql/gocql/go.sum +++ b/contrib/gocql/gocql/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/gofiber/fiber.v2/go.mod b/contrib/gofiber/fiber.v2/go.mod index 5fd8c63c2aa..cff36607c16 100644 --- a/contrib/gofiber/fiber.v2/go.mod +++ b/contrib/gofiber/fiber.v2/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/gofiber/fiber.v2/go.sum b/contrib/gofiber/fiber.v2/go.sum index 5eab280231d..b7ad98449f4 100644 --- a/contrib/gofiber/fiber.v2/go.sum +++ b/contrib/gofiber/fiber.v2/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/gomodule/redigo/go.mod b/contrib/gomodule/redigo/go.mod index 875a7308c16..e27cf499026 100644 --- a/contrib/gomodule/redigo/go.mod +++ b/contrib/gomodule/redigo/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/gomodule/redigo/go.sum b/contrib/gomodule/redigo/go.sum index ca7ab3695b1..1fd9d3afbb5 100644 --- a/contrib/gomodule/redigo/go.sum +++ b/contrib/gomodule/redigo/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/google.golang.org/api/go.mod b/contrib/google.golang.org/api/go.mod index 02760dc90d6..dc41bd1e3bb 100644 --- a/contrib/google.golang.org/api/go.mod +++ b/contrib/google.golang.org/api/go.mod @@ -12,7 +12,7 @@ require ( require ( cloud.google.com/go/compute/metadata v0.5.2 // indirect - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/google.golang.org/api/go.sum b/contrib/google.golang.org/api/go.sum index 9910fa791e9..99a47aafbce 100644 --- a/contrib/google.golang.org/api/go.sum +++ b/contrib/google.golang.org/api/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo= cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/google.golang.org/grpc/go.mod b/contrib/google.golang.org/grpc/go.mod index 07224e07c2c..c9453081105 100644 --- a/contrib/google.golang.org/grpc/go.mod +++ b/contrib/google.golang.org/grpc/go.mod @@ -12,7 +12,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/google.golang.org/grpc/go.sum b/contrib/google.golang.org/grpc/go.sum index e777e51f7ce..55972012fc2 100644 --- a/contrib/google.golang.org/grpc/go.sum +++ b/contrib/google.golang.org/grpc/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/gorilla/mux/go.mod b/contrib/gorilla/mux/go.mod index 25498e06a8f..4e31d51bb11 100644 --- a/contrib/gorilla/mux/go.mod +++ b/contrib/gorilla/mux/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/gorilla/mux/go.sum b/contrib/gorilla/mux/go.sum index 8b6a430029e..bfd05024fd7 100644 --- a/contrib/gorilla/mux/go.sum +++ b/contrib/gorilla/mux/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/gorilla/mux/mux.go b/contrib/gorilla/mux/mux.go index 5a957c45312..81ec973012d 100644 --- a/contrib/gorilla/mux/mux.go +++ b/contrib/gorilla/mux/mux.go @@ -108,6 +108,7 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) { spanopts = append(spanopts, httptraceinternal.HeaderTagsFromRequest(req, r.config.headerTags)) resource := r.config.resourceNamer(r, req) httptrace.TraceAndServe(r.Router, w, req, &httptrace.ServeConfig{ + Framework: "github.com/gorilla/mux", Service: r.config.serviceName, Resource: resource, FinishOpts: r.config.finishOpts, diff --git a/contrib/gorm.io/gorm.v1/go.mod b/contrib/gorm.io/gorm.v1/go.mod index 83ccdd50e56..6bc3e719da0 100644 --- a/contrib/gorm.io/gorm.v1/go.mod +++ b/contrib/gorm.io/gorm.v1/go.mod @@ -19,7 +19,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/gorm.io/gorm.v1/go.sum b/contrib/gorm.io/gorm.v1/go.sum index 22448a89e83..b3f29e0afb0 100644 --- a/contrib/gorm.io/gorm.v1/go.sum +++ b/contrib/gorm.io/gorm.v1/go.sum @@ -5,8 +5,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.1/go.mod h1:gLa1CL2RNE4s7M github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= github.com/AzureAD/microsoft-authentication-library-for-go v0.8.1/go.mod h1:4qFor3D/HDsvBME35Xy9rwW9DecL+M2sNw1ybjPtwA0= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/graph-gophers/graphql-go/go.mod b/contrib/graph-gophers/graphql-go/go.mod index d8e170cc3f1..2c659380c3f 100644 --- a/contrib/graph-gophers/graphql-go/go.mod +++ b/contrib/graph-gophers/graphql-go/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/graph-gophers/graphql-go/go.sum b/contrib/graph-gophers/graphql-go/go.sum index 5173b5c850e..9963f29215f 100644 --- a/contrib/graph-gophers/graphql-go/go.sum +++ b/contrib/graph-gophers/graphql-go/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/graphql-go/graphql/go.mod b/contrib/graphql-go/graphql/go.mod index 76e02e09915..849478a25f2 100644 --- a/contrib/graphql-go/graphql/go.mod +++ b/contrib/graphql-go/graphql/go.mod @@ -11,7 +11,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/graphql-go/graphql/go.sum b/contrib/graphql-go/graphql/go.sum index 566cbbe31f7..1322482bb92 100644 --- a/contrib/graphql-go/graphql/go.sum +++ b/contrib/graphql-go/graphql/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/hashicorp/consul/go.mod b/contrib/hashicorp/consul/go.mod index c302fcd6bf0..5d3778da1d9 100644 --- a/contrib/hashicorp/consul/go.mod +++ b/contrib/hashicorp/consul/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/hashicorp/consul/go.sum b/contrib/hashicorp/consul/go.sum index 2ee47ba9c00..3143842b4ee 100644 --- a/contrib/hashicorp/consul/go.sum +++ b/contrib/hashicorp/consul/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/hashicorp/vault/go.mod b/contrib/hashicorp/vault/go.mod index 08ff8524544..a4b26197296 100644 --- a/contrib/hashicorp/vault/go.mod +++ b/contrib/hashicorp/vault/go.mod @@ -11,7 +11,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/hashicorp/vault/go.sum b/contrib/hashicorp/vault/go.sum index 5df5e49ea61..fe32f5c3ca4 100644 --- a/contrib/hashicorp/vault/go.sum +++ b/contrib/hashicorp/vault/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/jackc/pgx.v5/go.mod b/contrib/jackc/pgx.v5/go.mod index 0f1b6803e51..720916d4906 100644 --- a/contrib/jackc/pgx.v5/go.mod +++ b/contrib/jackc/pgx.v5/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/jackc/pgx.v5/go.sum b/contrib/jackc/pgx.v5/go.sum index 87121d154e6..21a8fd33eab 100644 --- a/contrib/jackc/pgx.v5/go.sum +++ b/contrib/jackc/pgx.v5/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/jmoiron/sqlx/go.mod b/contrib/jmoiron/sqlx/go.mod index e548e248467..97238ed7ac3 100644 --- a/contrib/jmoiron/sqlx/go.mod +++ b/contrib/jmoiron/sqlx/go.mod @@ -14,7 +14,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/jmoiron/sqlx/go.sum b/contrib/jmoiron/sqlx/go.sum index c50bf0e49a2..787d4149f2e 100644 --- a/contrib/jmoiron/sqlx/go.sum +++ b/contrib/jmoiron/sqlx/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/julienschmidt/httprouter/go.mod b/contrib/julienschmidt/httprouter/go.mod index 812bba0544f..cb2cec8e56e 100644 --- a/contrib/julienschmidt/httprouter/go.mod +++ b/contrib/julienschmidt/httprouter/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/julienschmidt/httprouter/go.sum b/contrib/julienschmidt/httprouter/go.sum index 0a931f08f3b..ad7d37abbed 100644 --- a/contrib/julienschmidt/httprouter/go.sum +++ b/contrib/julienschmidt/httprouter/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/julienschmidt/httprouter/internal/tracing/tracing.go b/contrib/julienschmidt/httprouter/internal/tracing/tracing.go index 1ad4bda9bac..af2aabe01e7 100644 --- a/contrib/julienschmidt/httprouter/internal/tracing/tracing.go +++ b/contrib/julienschmidt/httprouter/internal/tracing/tracing.go @@ -53,10 +53,11 @@ func BeforeHandle[T any, WT Router]( spanOpts = append(spanOpts, httptrace.HeaderTagsFromRequest(req, cfg.headerTags)) serveCfg := &httptrace.ServeConfig{ - Service: cfg.serviceName, - Resource: resource, - SpanOpts: spanOpts, - Route: route, + Framework: "github.com/julienschmidt/httprouter", + Service: cfg.serviceName, + Resource: resource, + SpanOpts: spanOpts, + Route: route, } return httptrace.BeforeHandle(serveCfg, w, req) } diff --git a/contrib/k8s.io/client-go/go.mod b/contrib/k8s.io/client-go/go.mod index f2679675c38..3f582117937 100644 --- a/contrib/k8s.io/client-go/go.mod +++ b/contrib/k8s.io/client-go/go.mod @@ -11,7 +11,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/k8s.io/client-go/go.sum b/contrib/k8s.io/client-go/go.sum index 2c658107fd1..aeeb9283ed8 100644 --- a/contrib/k8s.io/client-go/go.sum +++ b/contrib/k8s.io/client-go/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/labstack/echo.v4/go.mod b/contrib/labstack/echo.v4/go.mod index 6d775d7f3d2..09e64b0f376 100644 --- a/contrib/labstack/echo.v4/go.mod +++ b/contrib/labstack/echo.v4/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/labstack/echo.v4/go.sum b/contrib/labstack/echo.v4/go.sum index 19ddca699ae..ee72650cb32 100644 --- a/contrib/labstack/echo.v4/go.sum +++ b/contrib/labstack/echo.v4/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/log/slog/go.mod b/contrib/log/slog/go.mod index 5bd72470ae5..63180ec47af 100644 --- a/contrib/log/slog/go.mod +++ b/contrib/log/slog/go.mod @@ -8,7 +8,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/log/slog/go.sum b/contrib/log/slog/go.sum index e777e51f7ce..55972012fc2 100644 --- a/contrib/log/slog/go.sum +++ b/contrib/log/slog/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/miekg/dns/go.mod b/contrib/miekg/dns/go.mod index a096272e441..4a88b22ca56 100644 --- a/contrib/miekg/dns/go.mod +++ b/contrib/miekg/dns/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/miekg/dns/go.sum b/contrib/miekg/dns/go.sum index 09cd6cb7076..2ddd78b5930 100644 --- a/contrib/miekg/dns/go.sum +++ b/contrib/miekg/dns/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/net/http/go.mod b/contrib/net/http/go.mod index cdb9a8d27f6..f2243792193 100644 --- a/contrib/net/http/go.mod +++ b/contrib/net/http/go.mod @@ -8,7 +8,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/net/http/go.sum b/contrib/net/http/go.sum index e777e51f7ce..55972012fc2 100644 --- a/contrib/net/http/go.sum +++ b/contrib/net/http/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/net/http/internal/wrap/handler.go b/contrib/net/http/internal/wrap/handler.go index afa33863ab3..16637af769e 100644 --- a/contrib/net/http/internal/wrap/handler.go +++ b/contrib/net/http/internal/wrap/handler.go @@ -12,6 +12,7 @@ import ( "github.com/DataDog/dd-trace-go/v2/ddtrace/ext" "github.com/DataDog/dd-trace-go/v2/ddtrace/tracer" "github.com/DataDog/dd-trace-go/v2/instrumentation/httptrace" + "github.com/DataDog/dd-trace-go/v2/instrumentation/net/http/pattern" ) type WrappedHandler struct { @@ -39,14 +40,15 @@ func Handler(h http.Handler, service, resource string, opts ...internal.Option) so := make([]tracer.StartSpanOption, len(cfg.SpanOpts), len(cfg.SpanOpts)+1) copy(so, cfg.SpanOpts) so = append(so, httptrace.HeaderTagsFromRequest(req, cfg.HeaderTags)) - pattern := getPattern(nil, req) + pttrn := getPattern(nil, req) TraceAndServe(h, w, req, &httptrace.ServeConfig{ + Framework: "net/http", Service: service, Resource: resc, FinishOpts: cfg.FinishOpts, SpanOpts: so, - Route: patternRoute(pattern), - RouteParams: patternValues(pattern, req), + Route: pattern.Route(pttrn), + RouteParams: pattern.PathParameters(pttrn, req), }) }) } diff --git a/contrib/net/http/internal/wrap/mux.go b/contrib/net/http/internal/wrap/mux.go index 02a14dad7ad..916027b8dc2 100644 --- a/contrib/net/http/internal/wrap/mux.go +++ b/contrib/net/http/internal/wrap/mux.go @@ -12,6 +12,7 @@ import ( "github.com/DataDog/dd-trace-go/v2/ddtrace/ext" "github.com/DataDog/dd-trace-go/v2/ddtrace/tracer" "github.com/DataDog/dd-trace-go/v2/instrumentation/httptrace" + "github.com/DataDog/dd-trace-go/v2/instrumentation/net/http/pattern" ) // ServeMux is an HTTP request multiplexer that traces all the incoming requests. @@ -45,8 +46,8 @@ func (mux *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { return } // get the resource associated to this request - _, pattern := mux.Handler(r) - route := patternRoute(pattern) + _, pttrn := mux.Handler(r) + route := pattern.Route(pttrn) resource := mux.cfg.ResourceNamer(r) if resource == "" { resource = r.Method + " " + route @@ -55,11 +56,12 @@ func (mux *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { copy(so, mux.cfg.SpanOpts) so = append(so, httptrace.HeaderTagsFromRequest(r, mux.cfg.HeaderTags)) TraceAndServe(mux.ServeMux, w, r, &httptrace.ServeConfig{ + Framework: "net/http", Service: mux.cfg.ServiceName, Resource: resource, SpanOpts: so, Route: route, IsStatusError: mux.cfg.IsStatusError, - RouteParams: patternValues(pattern, r), + RouteParams: pattern.PathParameters(pttrn, r), }) } diff --git a/contrib/olivere/elastic.v5/go.mod b/contrib/olivere/elastic.v5/go.mod index ddcdbe04ec8..f5281b51b6d 100644 --- a/contrib/olivere/elastic.v5/go.mod +++ b/contrib/olivere/elastic.v5/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/olivere/elastic.v5/go.sum b/contrib/olivere/elastic.v5/go.sum index 41051a8e3e1..5a41c677372 100644 --- a/contrib/olivere/elastic.v5/go.sum +++ b/contrib/olivere/elastic.v5/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/redis/go-redis.v9/go.mod b/contrib/redis/go-redis.v9/go.mod index d76a67f4cb4..09450828829 100644 --- a/contrib/redis/go-redis.v9/go.mod +++ b/contrib/redis/go-redis.v9/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/redis/go-redis.v9/go.sum b/contrib/redis/go-redis.v9/go.sum index e28fbde536d..c56df622350 100644 --- a/contrib/redis/go-redis.v9/go.sum +++ b/contrib/redis/go-redis.v9/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/redis/rueidis/go.mod b/contrib/redis/rueidis/go.mod index 710d78be7b9..f802dd841b7 100644 --- a/contrib/redis/rueidis/go.mod +++ b/contrib/redis/rueidis/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/redis/rueidis/go.sum b/contrib/redis/rueidis/go.sum index 55ea037a303..a64288c5539 100644 --- a/contrib/redis/rueidis/go.sum +++ b/contrib/redis/rueidis/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/segmentio/kafka-go/go.mod b/contrib/segmentio/kafka-go/go.mod index 935154f853f..cbd9c6ab411 100644 --- a/contrib/segmentio/kafka-go/go.mod +++ b/contrib/segmentio/kafka-go/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/segmentio/kafka-go/go.sum b/contrib/segmentio/kafka-go/go.sum index 4a5be74223f..73c2a0192f4 100644 --- a/contrib/segmentio/kafka-go/go.sum +++ b/contrib/segmentio/kafka-go/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/sirupsen/logrus/go.mod b/contrib/sirupsen/logrus/go.mod index ac00deb4c32..514cd5dc9ab 100644 --- a/contrib/sirupsen/logrus/go.mod +++ b/contrib/sirupsen/logrus/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/sirupsen/logrus/go.sum b/contrib/sirupsen/logrus/go.sum index 6929924b2a7..45304768af1 100644 --- a/contrib/sirupsen/logrus/go.sum +++ b/contrib/sirupsen/logrus/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/syndtr/goleveldb/go.mod b/contrib/syndtr/goleveldb/go.mod index a5adcd2f276..67b34adad00 100644 --- a/contrib/syndtr/goleveldb/go.mod +++ b/contrib/syndtr/goleveldb/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/syndtr/goleveldb/go.sum b/contrib/syndtr/goleveldb/go.sum index 1b037409cc1..872ab07645c 100644 --- a/contrib/syndtr/goleveldb/go.sum +++ b/contrib/syndtr/goleveldb/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/tidwall/buntdb/go.mod b/contrib/tidwall/buntdb/go.mod index 91da762d913..120fb440026 100644 --- a/contrib/tidwall/buntdb/go.mod +++ b/contrib/tidwall/buntdb/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/tidwall/buntdb/go.sum b/contrib/tidwall/buntdb/go.sum index 9a33f63122f..88a8492c640 100644 --- a/contrib/tidwall/buntdb/go.sum +++ b/contrib/tidwall/buntdb/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/twitchtv/twirp/go.mod b/contrib/twitchtv/twirp/go.mod index ec4e8c3a72c..1f8ed0eec14 100644 --- a/contrib/twitchtv/twirp/go.mod +++ b/contrib/twitchtv/twirp/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/twitchtv/twirp/go.sum b/contrib/twitchtv/twirp/go.sum index 80eba4c427f..21636d15a58 100644 --- a/contrib/twitchtv/twirp/go.sum +++ b/contrib/twitchtv/twirp/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/uptrace/bun/go.mod b/contrib/uptrace/bun/go.mod index e3bfea20826..5a306a1c9bb 100644 --- a/contrib/uptrace/bun/go.mod +++ b/contrib/uptrace/bun/go.mod @@ -16,7 +16,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/uptrace/bun/go.sum b/contrib/uptrace/bun/go.sum index d7ea4101598..4120937d307 100644 --- a/contrib/uptrace/bun/go.sum +++ b/contrib/uptrace/bun/go.sum @@ -3,8 +3,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.2/go.mod h1:uGG2W01BaETf0Ozp+Q github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.1/go.mod h1:gLa1CL2RNE4s7M3yopJ/p0iq5DdY6Yv5ZUt9MTRZOQM= github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= github.com/AzureAD/microsoft-authentication-library-for-go v0.8.1/go.mod h1:4qFor3D/HDsvBME35Xy9rwW9DecL+M2sNw1ybjPtwA0= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/urfave/negroni/go.mod b/contrib/urfave/negroni/go.mod index dbd754d0a93..77d109f7c76 100644 --- a/contrib/urfave/negroni/go.mod +++ b/contrib/urfave/negroni/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/urfave/negroni/go.sum b/contrib/urfave/negroni/go.sum index caa392764a8..375d2a9e319 100644 --- a/contrib/urfave/negroni/go.sum +++ b/contrib/urfave/negroni/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/valkey-io/valkey-go/go.mod b/contrib/valkey-io/valkey-go/go.mod index 949ce905083..d42a8cd219d 100644 --- a/contrib/valkey-io/valkey-go/go.mod +++ b/contrib/valkey-io/valkey-go/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/valkey-io/valkey-go/go.sum b/contrib/valkey-io/valkey-go/go.sum index 00110e8aa96..06c1736d34f 100644 --- a/contrib/valkey-io/valkey-go/go.sum +++ b/contrib/valkey-io/valkey-go/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/valyala/fasthttp/go.mod b/contrib/valyala/fasthttp/go.mod index 179c68cb885..7600ef45ffd 100644 --- a/contrib/valyala/fasthttp/go.mod +++ b/contrib/valyala/fasthttp/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/contrib/valyala/fasthttp/go.sum b/contrib/valyala/fasthttp/go.sum index 476f6339893..cb2fed72c0f 100644 --- a/contrib/valyala/fasthttp/go.sum +++ b/contrib/valyala/fasthttp/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/go.mod b/go.mod index 99d4ada0715..f0f6826df0d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.0 godebug x509negativeserial=1 require ( - github.com/DataDog/appsec-internal-go v1.9.0 + github.com/DataDog/appsec-internal-go v1.11.2 github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.64.0-rc.1 diff --git a/go.sum b/go.sum index 47e342bae5d..094fd77909f 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/go.work.sum b/go.work.sum index 5ba32a6783d..a9397f6ed28 100644 --- a/go.work.sum +++ b/go.work.sum @@ -282,6 +282,8 @@ github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= +github.com/DataDog/appsec-internal-go v1.11.0 h1:ntSePlOw0LYqGSgHaci97z//AD+y6aEz2FgsWB6qZ9Q= +github.com/DataDog/appsec-internal-go v1.11.0/go.mod h1:8DsHQdz1ERLfki5I+tVfFahDzQFVQBlEHQ/ixAWDyxc= github.com/DataDog/datadog-agent/comp/trace/compression/def v0.64.0-rc.1 h1:yjO0qOUDDjC6i+w7eKGpXkkgPkpGP6D3ln1clFav62s= github.com/DataDog/datadog-agent/comp/trace/compression/def v0.64.0-rc.1/go.mod h1:+BnlaBR5kMqTFYwDEc1QW0f6zvLJKnwBAUbeC68HaVs= github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.64.0-rc.1 h1:Rx2o4Sk1IwkpZbZu5PoLaai8rQjegwJ/eieEjryaU10= diff --git a/instrumentation/appsec/emitter/httpsec/config.go b/instrumentation/appsec/emitter/httpsec/config.go index bdbf3af3178..8a0cf88075e 100644 --- a/instrumentation/appsec/emitter/httpsec/config.go +++ b/instrumentation/appsec/emitter/httpsec/config.go @@ -5,9 +5,15 @@ package httpsec -import "net/http" +import ( + "net/http" + + "github.com/DataDog/dd-trace-go/v2/instrumentation/net/http/pattern" +) type Config struct { + // Framework is the name of the framework or library being used (optional). + Framework string // OnBlock is a list of callbacks to be invoked when a block decision is made. OnBlock []func() // ResponseHeaderCopier provides a way to access response headers for reading @@ -15,10 +21,12 @@ type Config struct { // apply synchronization if they allow http.ResponseWriter objects to be // accessed by multiple goroutines. ResponseHeaderCopier func(http.ResponseWriter) http.Header + // RouteForRequest returns the route string for the given request, or blank if + // no route information can be determined. + RouteForRequest func(*http.Request) string } var defaultWrapHandlerConfig = &Config{ - ResponseHeaderCopier: func(w http.ResponseWriter) http.Header { - return w.Header() - }, + ResponseHeaderCopier: func(w http.ResponseWriter) http.Header { return w.Header() }, + RouteForRequest: func(r *http.Request) string { return pattern.Route(r.Pattern) }, } diff --git a/instrumentation/appsec/emitter/httpsec/http.go b/instrumentation/appsec/emitter/httpsec/http.go index fd3303a313e..5bfe7feb7e7 100644 --- a/instrumentation/appsec/emitter/httpsec/http.go +++ b/instrumentation/appsec/emitter/httpsec/http.go @@ -22,6 +22,7 @@ import ( "github.com/DataDog/dd-trace-go/v2/instrumentation/appsec/emitter/waf/addresses" "github.com/DataDog/dd-trace-go/v2/instrumentation/appsec/trace" "github.com/DataDog/dd-trace-go/v2/internal/appsec/emitter/waf" + "github.com/DataDog/dd-trace-go/v2/internal/telemetry" ) // HandlerOperation type representing an HTTP operation. It must be created with @@ -33,18 +34,27 @@ type ( // wafContextOwner indicates if the waf.ContextOperation was started by us or not and if we need to close it. wafContextOwner bool + + // framework is the name of the framework or library that started the operation. + framework string + // method is the HTTP method for the current handler operation. + method string + // route is the HTTP route for the current handler operation (or the URL if no route is available). + route string } // HandlerOperationArgs is the HTTP handler operation arguments. HandlerOperationArgs struct { - Method string - RequestURI string - Host string - RemoteAddr string - Headers map[string][]string - Cookies map[string][]string - QueryParams map[string][]string - PathParams map[string]string + Framework string // Optional: name of the framework or library being used + Method string + RequestURI string + RequestRoute string // the HTTP route for the current handler operation, if available + Host string + RemoteAddr string + Headers map[string][]string + Cookies map[string][]string + QueryParams map[string][]string + PathParams map[string]string } // HandlerOperationRes is the HTTP handler operation results. @@ -67,6 +77,14 @@ func StartOperation(ctx context.Context, args HandlerOperationArgs, span trace.T Operation: dyngo.NewOperation(wafOp), ContextOperation: wafOp, wafContextOwner: !found, // If we started the parent operation, we finish it, otherwise we don't + framework: args.Framework, + method: args.Method, + route: args.RequestRoute, + } + if op.route == "" { + // If there is no route, use the request URI instead + telemetry.Count(telemetry.NamespaceAppSec, "api_security.missing_route", []string{"framework:" + args.Framework}).Submit(1) + op.route = args.RequestURI } // We need to use an atomic pointer to store the action because the action may be created asynchronously in the future @@ -78,6 +96,21 @@ func StartOperation(ctx context.Context, args HandlerOperationArgs, span trace.T return op, &action, dyngo.StartAndRegisterOperation(ctx, op, args) } +// Framework returns the name of the framework or library that started the operation. +func (op *HandlerOperation) Framework() string { + return op.framework +} + +// Method returns the HTTP method for the current handler operation. +func (op *HandlerOperation) Method() string { + return op.method +} + +// Route returns the HTTP route for the current handler operation. +func (op *HandlerOperation) Route() string { + return op.route +} + // Finish the HTTP handler operation and its children operations and write everything to the service entry span. func (op *HandlerOperation) Finish(res HandlerOperationRes) { dyngo.FinishOperation(op, res) @@ -129,19 +162,25 @@ func BeforeHandle( ) (http.ResponseWriter, *http.Request, func(), bool) { if opts == nil { opts = defaultWrapHandlerConfig - } else if opts.ResponseHeaderCopier == nil { + } + if opts.ResponseHeaderCopier == nil { opts.ResponseHeaderCopier = defaultWrapHandlerConfig.ResponseHeaderCopier } + if opts.RouteForRequest == nil { + opts.RouteForRequest = defaultWrapHandlerConfig.RouteForRequest + } op, blockAtomic, ctx := StartOperation(r.Context(), HandlerOperationArgs{ - Method: r.Method, - RequestURI: r.RequestURI, - Host: r.Host, - RemoteAddr: r.RemoteAddr, - Headers: r.Header, - Cookies: makeCookies(r.Cookies()), - QueryParams: r.URL.Query(), - PathParams: pathParams, + Framework: opts.Framework, + Method: r.Method, + RequestURI: r.RequestURI, + RequestRoute: opts.RouteForRequest(r), + Host: r.Host, + RemoteAddr: r.RemoteAddr, + Headers: r.Header, + Cookies: makeCookies(r.Cookies()), + QueryParams: r.URL.Query(), + PathParams: pathParams, }, span) tr := r.WithContext(ctx) diff --git a/instrumentation/httptrace/before_handle.go b/instrumentation/httptrace/before_handle.go index c6ce355ca17..eb3bd867d5f 100644 --- a/instrumentation/httptrace/before_handle.go +++ b/instrumentation/httptrace/before_handle.go @@ -11,12 +11,15 @@ import ( "github.com/DataDog/dd-trace-go/v2/ddtrace/ext" "github.com/DataDog/dd-trace-go/v2/ddtrace/tracer" "github.com/DataDog/dd-trace-go/v2/instrumentation/appsec/emitter/httpsec" + "github.com/DataDog/dd-trace-go/v2/instrumentation/net/http/pattern" "github.com/DataDog/dd-trace-go/v2/instrumentation/options" "github.com/DataDog/dd-trace-go/v2/internal/appsec" ) // ServeConfig specifies the tracing configuration when using TraceAndServe. type ServeConfig struct { + // Framework is the name of the framework or library being used (optional). + Framework string // Service specifies the service name to use. If left blank, the global service name // will be inherited. Service string @@ -68,7 +71,17 @@ func BeforeHandle(cfg *ServeConfig, w http.ResponseWriter, r *http.Request) (htt afterHandle := closeSpan handled := false if appsec.Enabled() { - secW, secReq, secAfterHandle, secHandled := httpsec.BeforeHandle(rw, rt, span, cfg.RouteParams, nil) + appsecConfig := &httpsec.Config{ + Framework: cfg.Framework, + RouteForRequest: func(r *http.Request) string { + if cfg.Route != "" { + return cfg.Route + } + return pattern.Route(r.Pattern) + }, + } + + secW, secReq, secAfterHandle, secHandled := httpsec.BeforeHandle(rw, rt, span, cfg.RouteParams, appsecConfig) afterHandle = func() { secAfterHandle() closeSpan() diff --git a/instrumentation/httptracemock/httptracemock.go b/instrumentation/httptracemock/httptracemock.go index 79d3153d09d..05168673c8a 100644 --- a/instrumentation/httptracemock/httptracemock.go +++ b/instrumentation/httptracemock/httptracemock.go @@ -39,11 +39,22 @@ type responseWriter struct { statusCode int } +func (rw *responseWriter) Write(b []byte) (int, error) { + if rw.statusCode == 0 { + rw.statusCode = http.StatusOK + } + return rw.ResponseWriter.Write(b) +} + func (rw *responseWriter) WriteHeader(code int) { rw.statusCode = code rw.ResponseWriter.WriteHeader(code) } +func (rw *responseWriter) Status() int { + return rw.statusCode +} + // ServeHTTP dispatches the request to the handler // whose pattern most closely matches the request URL. // We only need to rewrite this function to be able to trace @@ -53,9 +64,10 @@ func (mux *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { _, route := mux.Handler(r) resource := r.Method + " " + route - so := make([]tracer.StartSpanOption, len(mux.spanOpts), len(mux.spanOpts)+1) + so := make([]tracer.StartSpanOption, len(mux.spanOpts), len(mux.spanOpts)+2) copy(so, mux.spanOpts) so = append(so, tracer.ResourceName(resource)) + so = append(so, tracer.Tag(ext.HTTPRoute, route)) rw := &responseWriter{ResponseWriter: w} span, ctx, finishSpans := httptrace.StartRequestSpan(r, so...) @@ -64,7 +76,9 @@ func (mux *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { }() var h http.Handler = mux.ServeMux if appsec.Enabled() { - h = httpsec.WrapHandler(h, span, nil, nil) + h = httpsec.WrapHandler(h, span, nil, &httpsec.Config{ + RouteForRequest: func(*http.Request) string { return route }, + }) } h.ServeHTTP(rw, r.WithContext(ctx)) } diff --git a/instrumentation/internal/namingschematest/go.mod b/instrumentation/internal/namingschematest/go.mod index 5c7c6f9ceab..98b9ed7072f 100644 --- a/instrumentation/internal/namingschematest/go.mod +++ b/instrumentation/internal/namingschematest/go.mod @@ -95,7 +95,7 @@ require ( cloud.google.com/go v0.112.1 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.1.7 // indirect - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/instrumentation/internal/namingschematest/go.sum b/instrumentation/internal/namingschematest/go.sum index be626e1f5f0..977b4b75084 100644 --- a/instrumentation/internal/namingschematest/go.sum +++ b/instrumentation/internal/namingschematest/go.sum @@ -21,8 +21,8 @@ github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1r github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/contrib/net/http/internal/wrap/pattern.go b/instrumentation/net/http/pattern/pattern.go similarity index 79% rename from contrib/net/http/internal/wrap/pattern.go rename to instrumentation/net/http/pattern/pattern.go index ddef288306b..a67d1a61b4b 100644 --- a/contrib/net/http/internal/wrap/pattern.go +++ b/instrumentation/net/http/pattern/pattern.go @@ -3,22 +3,22 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025 Datadog, Inc. -package wrap +package pattern import ( "errors" "fmt" "net/http" "strings" - "sync" "unicode" - internal "github.com/DataDog/dd-trace-go/contrib/net/http/v2/internal/config" + "github.com/DataDog/dd-trace-go/v2/internal/telemetry/log" + "github.com/puzpuzpuz/xsync/v3" ) -// patternRoute returns the route part of a go1.22 style ServeMux pattern. I.e. +// Route returns the route part of a go1.22 style ServeMux pattern. I.e. // it returns "/foo" for the pattern "/foo" as well as the pattern "GET /foo". -func patternRoute(s string) string { +func Route(s string) string { // Support go1.22 serve mux patterns: [METHOD ][HOST]/[PATH] // Consider any text before a space or tab to be the method of the pattern. // See net/http.parsePattern and the link below for more information. @@ -29,14 +29,12 @@ func patternRoute(s string) string { return s } -var patternSegmentsCache sync.Map // map[string][]string - -// patternValues return the path parameter values and names from the request. -func patternValues(pattern string, request *http.Request) map[string]string { +// PathParameters return the path parameter values and names from the request. +func PathParameters(pattern string, request *http.Request) map[string]string { if pattern == "" { return nil } - names := getPatternNames(pattern) + names := patternNames(pattern) res := make(map[string]string, len(names)) for _, name := range names { res[name] = request.PathValue(name) @@ -44,23 +42,20 @@ func patternValues(pattern string, request *http.Request) map[string]string { return res } -func getPatternNames(pattern string) []string { - if v, ok := patternSegmentsCache.Load(pattern); ok { - if v == nil { - return nil - } - return v.([]string) - } - - segments, err := parsePatternNames(pattern) - if err != nil { - // Ignore the error: Something as gone wrong, but we are not eager to find out why. - internal.Instrumentation.Logger().Debug("contrib/net/http: failed to parse mux path pattern %q: %v", pattern, err) - // here we fallthrough instead of returning to load a nil value into the cache to avoid reparsing the pattern. - } +var patternSegmentsCache = xsync.NewMapOf[string, []string]() - patternSegmentsCache.Store(pattern, segments) - return segments +func patternNames(pattern string) []string { + v, _ := patternSegmentsCache.LoadOrCompute(pattern, func() []string { + segments, err := parsePatternNames(pattern) + if err != nil { + // Ignore the error: Something as gone wrong, but we are not eager to find out why. + // We will just log it as a telemetry logs warning (and Debug to the user-facing log). + log.Warn("instrumentation/net/http/pattern: failed to parse mux path pattern %q: %v", pattern, err) + // here we fallthrough instead of returning to load a nil value into the cache to avoid reparsing the pattern. + } + return segments + }) + return v } // parsePatternNames returns the names of the wildcards in the pattern. diff --git a/contrib/net/http/internal/wrap/pattern_test.go b/instrumentation/net/http/pattern/pattern_test.go similarity index 75% rename from contrib/net/http/internal/wrap/pattern_test.go rename to instrumentation/net/http/pattern/pattern_test.go index 6eb78b95bd9..ee88b715d45 100644 --- a/contrib/net/http/internal/wrap/pattern_test.go +++ b/instrumentation/net/http/pattern/pattern_test.go @@ -3,19 +3,25 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). // Copyright 2025 Datadog, Inc. -package wrap +package pattern import ( + "io" "net/http" "net/http/httptest" "testing" - "github.com/DataDog/dd-trace-go/v2/ddtrace/ext" - "github.com/DataDog/dd-trace-go/v2/ddtrace/mocktracer" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) -func TestPathParams(t *testing.T) { +func TestPathParameters(t *testing.T) { + t.Run("blank", func(t *testing.T) { + req := httptest.NewRequest("GET", "/foo/123", nil) + assert.Equal(t, "", req.Pattern) + require.Nil(t, PathParameters(req.Pattern, req)) + }) + for _, tt := range []struct { name string pattern string @@ -66,10 +72,10 @@ func TestPathParams(t *testing.T) { }, } { t.Run(tt.name, func(t *testing.T) { - mux := NewServeMux() + mux := http.NewServeMux() mux.HandleFunc(tt.pattern, func(_ http.ResponseWriter, r *http.Request) { _, pattern := mux.Handler(r) - params := patternValues(pattern, r) + params := PathParameters(pattern, r) assert.Equal(t, tt.expected, params) }) @@ -80,7 +86,7 @@ func TestPathParams(t *testing.T) { } } -func TestPatternNames(t *testing.T) { +func TestParsePatternNames(t *testing.T) { tests := []struct { pattern string expected []string @@ -133,34 +139,31 @@ func TestPatternNames(t *testing.T) { } func TestServeMuxGo122Patterns(t *testing.T) { - mt := mocktracer.Start() - defer mt.Stop() - // A mux with go1.21 patterns ("/bar") and go1.22 patterns ("GET /foo") - mux := NewServeMux() - mux.HandleFunc("/bar", func(_ http.ResponseWriter, _ *http.Request) {}) - mux.HandleFunc("GET /foo", func(_ http.ResponseWriter, _ *http.Request) {}) - - // Try to hit both routes - barW := httptest.NewRecorder() - mux.ServeHTTP(barW, httptest.NewRequest("GET", "/bar", nil)) - fooW := httptest.NewRecorder() - mux.ServeHTTP(fooW, httptest.NewRequest("GET", "/foo", nil)) + mux := http.NewServeMux() + handler := func(w http.ResponseWriter, r *http.Request) { + route := Route(r.Pattern) + w.Write([]byte(route)) + } + mux.HandleFunc("/bar/{id}", handler) + mux.HandleFunc("GET /foo/{id}/baz", handler) - // Assert the number of spans - assert := assert.New(t) - spans := mt.FinishedSpans() - assert.Equal(2, len(spans)) + srv := httptest.NewServer(mux) + defer srv.Close() - // Check the /bar span - barSpan := spans[0] - assert.Equal(http.StatusOK, barW.Code) - assert.Equal("/bar", barSpan.Tag(ext.HTTPRoute)) - assert.Equal("GET /bar", barSpan.Tag(ext.ResourceName)) + // Check for the /bar route + res, err := srv.Client().Get(srv.URL + "/bar/1337") + require.NoError(t, err) + body, err := io.ReadAll(res.Body) + res.Body.Close() + require.NoError(t, err) + require.Equal(t, "/bar/{id}", string(body)) - // Check the /foo span - fooSpan := spans[1] - assert.Equal(http.StatusOK, fooW.Code) - assert.Equal("/foo", fooSpan.Tag(ext.HTTPRoute)) - assert.Equal("GET /foo", fooSpan.Tag(ext.ResourceName)) + // Check for the /foo route + res, err = srv.Client().Get(srv.URL + "/foo/42/baz") + require.NoError(t, err) + body, err = io.ReadAll(res.Body) + res.Body.Close() + require.NoError(t, err) + require.Equal(t, "/foo/{id}/baz", string(body)) } diff --git a/instrumentation/testutils/grpc/go.mod b/instrumentation/testutils/grpc/go.mod index 8a0f5828e8c..2f72c713356 100644 --- a/instrumentation/testutils/grpc/go.mod +++ b/instrumentation/testutils/grpc/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/instrumentation/testutils/grpc/go.sum b/instrumentation/testutils/grpc/go.sum index e777e51f7ce..55972012fc2 100644 --- a/instrumentation/testutils/grpc/go.sum +++ b/instrumentation/testutils/grpc/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/instrumentation/testutils/testutils.go b/instrumentation/testutils/testutils.go index 5de48d2b757..3d965c9bafa 100644 --- a/instrumentation/testutils/testutils.go +++ b/instrumentation/testutils/testutils.go @@ -12,6 +12,7 @@ import ( "github.com/DataDog/dd-trace-go/v2/ddtrace/tracer" "github.com/DataDog/dd-trace-go/v2/internal/appsec" + "github.com/DataDog/dd-trace-go/v2/internal/appsec/config" "github.com/DataDog/dd-trace-go/v2/internal/globalconfig" "github.com/DataDog/dd-trace-go/v2/internal/normalizer" "github.com/DataDog/dd-trace-go/v2/internal/statsdtest" @@ -66,8 +67,8 @@ func SetGlobalHeaderTags(t *testing.T, headers ...string) { setValue(headers) } -func StartAppSec(t *testing.T) { - appsec.Start() +func StartAppSec(t *testing.T, opts ...config.StartOption) { + appsec.Start(opts...) t.Cleanup(appsec.Stop) } diff --git a/internal/apps/go.mod b/internal/apps/go.mod index 51327314802..4405cc5bfac 100644 --- a/internal/apps/go.mod +++ b/internal/apps/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/internal/apps/go.sum b/internal/apps/go.sum index 6f8543b98cd..ca9c543651e 100644 --- a/internal/apps/go.sum +++ b/internal/apps/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/internal/appsec/config/config.go b/internal/appsec/config/config.go index dbd230b150b..55f223e546c 100644 --- a/internal/appsec/config/config.go +++ b/internal/appsec/config/config.go @@ -55,6 +55,8 @@ type StartConfig struct { EnablementMode func() (EnablementMode, Origin, error) // MetaStructAvailable is true if meta struct is supported by the trace agent. MetaStructAvailable bool + + APISecOptions []internal.APISecOption } type EnablementMode int8 @@ -126,6 +128,12 @@ func WithMetaStructAvailable(available bool) StartOption { } } +func WithAPISecOptions(opts ...internal.APISecOption) StartOption { + return func(c *StartConfig) { + c.APISecOptions = append(c.APISecOptions, opts...) + } +} + // Config is the AppSec configuration. type Config struct { // rules loaded via the env var DD_APPSEC_RULES. When not set, the builtin rules will be used @@ -210,7 +218,7 @@ func (c *StartConfig) NewConfig() (*Config, error) { WAFTimeout: internal.WAFTimeoutFromEnv(), TraceRateLimit: int64(internal.RateLimitFromEnv()), Obfuscator: internal.NewObfuscatorConfig(), - APISec: internal.NewAPISecConfig(), + APISec: internal.NewAPISecConfig(c.APISecOptions...), RASP: internal.RASPEnabled(), RC: c.RC, MetaStructAvailable: c.MetaStructAvailable, diff --git a/internal/appsec/listener/httpsec/http.go b/internal/appsec/listener/httpsec/http.go index 683237dc0dc..01ff6c9e862 100644 --- a/internal/appsec/listener/httpsec/http.go +++ b/internal/appsec/listener/httpsec/http.go @@ -6,9 +6,10 @@ package httpsec import ( - "math/rand" + "strings" - internal "github.com/DataDog/appsec-internal-go/appsec" + "github.com/DataDog/appsec-internal-go/apisec" + "github.com/DataDog/appsec-internal-go/appsec" "github.com/DataDog/dd-trace-go/v2/instrumentation/appsec/dyngo" "github.com/DataDog/dd-trace-go/v2/instrumentation/appsec/emitter/httpsec" @@ -16,10 +17,11 @@ import ( "github.com/DataDog/dd-trace-go/v2/internal/appsec/config" "github.com/DataDog/dd-trace-go/v2/internal/appsec/listener" "github.com/DataDog/dd-trace-go/v2/internal/log" + "github.com/DataDog/dd-trace-go/v2/internal/telemetry" ) type Feature struct { - APISec internal.APISecConfig + APISec appsec.APISecConfig } func (*Feature) String() string { @@ -81,15 +83,29 @@ func (feature *Feature) OnResponse(op *httpsec.HandlerOperation, resp httpsec.Ha WithResponseHeadersNoCookies(headers). WithResponseStatus(resp.StatusCode) - if feature.canExtractSchemas() { + if feature.shouldExtractShema(op, resp.StatusCode) { builder = builder.ExtractSchema() } op.Run(op, builder.Build()) + + metric := "no_schema" + for k := range op.Derivatives() { + if strings.HasPrefix(k, "_dd.appsec.s.") { + metric = "schema" + break + } + } + telemetry.Count(telemetry.NamespaceAppSec, "api_security.request."+metric, []string{"framework:" + op.Framework()}).Submit(1) } -// canExtractSchemas checks that API Security is enabled and that sampling rate +// shouldExtractShema checks that API Security is enabled and that sampling rate // allows extracting schemas -func (feature *Feature) canExtractSchemas() bool { - return feature.APISec.Enabled && feature.APISec.SampleRate >= rand.Float64() +func (feature *Feature) shouldExtractShema(op *httpsec.HandlerOperation, statusCode int) bool { + return feature.APISec.Enabled && + feature.APISec.Sampler.DecisionFor(apisec.SamplingKey{ + Method: op.Method(), + Route: op.Route(), + StatusCode: statusCode, + }) } diff --git a/internal/appsec/waf_test.go b/internal/appsec/waf_test.go index 65bba6b7b58..f4f7f49f47f 100644 --- a/internal/appsec/waf_test.go +++ b/internal/appsec/waf_test.go @@ -20,6 +20,8 @@ import ( internal "github.com/DataDog/appsec-internal-go/appsec" waf "github.com/DataDog/go-libddwaf/v3" + + "github.com/DataDog/appsec-internal-go/apisec" "github.com/stretchr/testify/assert" pAppsec "github.com/DataDog/dd-trace-go/v2/appsec" @@ -33,6 +35,7 @@ import ( "github.com/DataDog/dd-trace-go/v2/instrumentation/testutils" "github.com/DataDog/dd-trace-go/v2/internal/appsec" "github.com/DataDog/dd-trace-go/v2/internal/appsec/config" + "github.com/stretchr/testify/mock" "github.com/DataDog/dd-trace-go/v2/internal/telemetry" "github.com/DataDog/dd-trace-go/v2/internal/telemetry/telemetrytest" @@ -476,20 +479,27 @@ func TestAPISecurity(t *testing.T) { t.Skipf("WAF must be usable for this test to run correctly: %v", err) } mux := httptrace.NewServeMux() - mux.HandleFunc("/apisec", func(w http.ResponseWriter, r *http.Request) { + mux.HandleFunc("/apisec/{id}", func(w http.ResponseWriter, r *http.Request) { pAppsec.MonitorParsedHTTPBody(r.Context(), "plain body") w.Write([]byte("Hello World!\n")) }) srv := httptest.NewServer(mux) defer srv.Close() - req, err := http.NewRequest("POST", srv.URL+"/apisec?vin=AAAAAAAAAAAAAAAAA", nil) + req, err := http.NewRequest("POST", srv.URL+"/apisec/1337?vin=AAAAAAAAAAAAAAAAA", nil) require.NoError(t, err) t.Run("enabled", func(t *testing.T) { + var sampler mockSampler + samplingKey := apisec.SamplingKey{ + Method: "POST", + Route: "/apisec/{id}", + StatusCode: 200, + } + sampler.On("DecisionFor", samplingKey).Return(true).Once() + t.Setenv(internal.EnvAPISecEnabled, "true") - t.Setenv(internal.EnvAPISecSampleRate, "1.0") - testutils.StartAppSec(t) + testutils.StartAppSec(t, config.WithAPISecOptions(internal.WithAPISecSampler(&sampler))) require.True(t, appsec.Enabled()) mt := mocktracer.Start() @@ -502,15 +512,39 @@ func TestAPISecurity(t *testing.T) { spans := mt.FinishedSpans() require.Len(t, spans, 1) + // Verify we did make a sampling decision as expected... + sampler.AssertCalled(t, "DecisionFor", samplingKey) + // Make sure the addresses that are present are getting extracted as schemas - require.NotNil(t, spans[0].Tag("_dd.appsec.s.req.headers")) - require.NotNil(t, spans[0].Tag("_dd.appsec.s.req.query")) - require.NotNil(t, spans[0].Tag("_dd.appsec.s.req.body")) + assert.NotNil(t, spans[0].Tag("_dd.appsec.s.req.headers")) + assert.NotNil(t, spans[0].Tag("_dd.appsec.s.req.query")) + assert.NotNil(t, spans[0].Tag("_dd.appsec.s.req.body")) + + t.Run("sampler-drops-second-request", func(t *testing.T) { + sampler.On("DecisionFor", samplingKey).Return(false).Once() + + res, err := srv.Client().Do(req) + require.NoError(t, err) + defer res.Body.Close() + + spans := mt.FinishedSpans() + require.Len(t, spans, 2) // Includes the span from the first request... + + // Verify we did make a sampling decision as expected... + sampler.AssertCalled(t, "DecisionFor", samplingKey) + + // Make sure that the schema has NOT been extracted + assert.Nil(t, spans[1].Tag("_dd.appsec.s.req.headers")) + assert.Nil(t, spans[1].Tag("_dd.appsec.s.req.query")) + assert.Nil(t, spans[1].Tag("_dd.appsec.s.req.body")) + }) }) t.Run("disabled", func(t *testing.T) { + var sampler mockSampler + t.Setenv(internal.EnvAPISecEnabled, "false") - testutils.StartAppSec(t) + testutils.StartAppSec(t, config.WithAPISecOptions(internal.WithAPISecSampler(&sampler))) require.True(t, appsec.Enabled()) mt := mocktracer.Start() @@ -523,6 +557,9 @@ func TestAPISecurity(t *testing.T) { spans := mt.FinishedSpans() require.Len(t, spans, 1) + // Make sure the sampler was never called + sampler.AssertNotCalled(t, "DecisionFor") + // Make sure the addresses that are present are not getting extracted as schemas require.Nil(t, spans[0].Tag("_dd.appsec.s.req.headers")) require.Nil(t, spans[0].Tag("_dd.appsec.s.req.query")) @@ -847,6 +884,7 @@ func BenchmarkSampleWAFContext(b *testing.B) { } handle, err := waf.NewHandle(parsedRuleset, internal.DefaultObfuscatorKeyRegex, internal.DefaultObfuscatorValueRegex) + require.NoError(b, err) for i := 0; i < b.N; i++ { ctx, err := handle.NewContext() if err != nil || ctx == nil { @@ -984,6 +1022,15 @@ func TestAttackerFingerprinting(t *testing.T) { } } +type mockSampler struct { + mock.Mock +} + +func (m *mockSampler) DecisionFor(key apisec.SamplingKey) bool { + ret := m.Called(key) + return ret.Bool(0) +} + func init() { // This permits running the tests locally without defining the env var manually // We do this because the default go-libddwaf timeout value is too small and makes the tests timeout for no reason diff --git a/internal/appsec/waf_unit_test.go b/internal/appsec/waf_unit_test.go index def30f644bc..96dff1c7a78 100644 --- a/internal/appsec/waf_unit_test.go +++ b/internal/appsec/waf_unit_test.go @@ -177,9 +177,13 @@ func TestAPISecuritySchemaCollection(t *testing.T) { require.NoError(t, err) require.True(t, wafRes.HasDerivatives()) for k, v := range wafRes.Derivatives { + expected, checked := tc.tags[k] + if !checked { + continue + } res, err := json.Marshal(v) require.NoError(t, err) - require.Equal(t, tc.tags[k], string(res)) + require.Equal(t, expected, string(res)) } }) } diff --git a/internal/contrib/validationtest/go.mod b/internal/contrib/validationtest/go.mod index 4bc707cc89b..b33ee600dd5 100644 --- a/internal/contrib/validationtest/go.mod +++ b/internal/contrib/validationtest/go.mod @@ -12,7 +12,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/internal/contrib/validationtest/go.sum b/internal/contrib/validationtest/go.sum index 03c9c681371..69719dc6289 100644 --- a/internal/contrib/validationtest/go.sum +++ b/internal/contrib/validationtest/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/internal/exectracetest/go.mod b/internal/exectracetest/go.mod index 3fecc775c15..5600cee7eee 100644 --- a/internal/exectracetest/go.mod +++ b/internal/exectracetest/go.mod @@ -11,7 +11,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/internal/exectracetest/go.sum b/internal/exectracetest/go.sum index 600f1108729..514679f06e4 100644 --- a/internal/exectracetest/go.sum +++ b/internal/exectracetest/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/internal/orchestrion/_integration/go.mod b/internal/orchestrion/_integration/go.mod index 67a8d516b70..32d4f60dd69 100644 --- a/internal/orchestrion/_integration/go.mod +++ b/internal/orchestrion/_integration/go.mod @@ -80,7 +80,7 @@ require ( cloud.google.com/go/iam v1.2.1 // indirect dario.cat/mergo v1.0.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/internal/orchestrion/_integration/go.sum b/internal/orchestrion/_integration/go.sum index 929bd2c6997..24a826d9681 100644 --- a/internal/orchestrion/_integration/go.sum +++ b/internal/orchestrion/_integration/go.sum @@ -637,8 +637,8 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/internal/setup-smoke-test/go.mod b/internal/setup-smoke-test/go.mod index 53e78e89c0e..9c5bde487ac 100644 --- a/internal/setup-smoke-test/go.mod +++ b/internal/setup-smoke-test/go.mod @@ -8,7 +8,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/internal/setup-smoke-test/go.sum b/internal/setup-smoke-test/go.sum index c0c3ddb9525..ae55edd62a3 100644 --- a/internal/setup-smoke-test/go.sum +++ b/internal/setup-smoke-test/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/internal/traceprof/traceproftest/go.mod b/internal/traceprof/traceproftest/go.mod index 95951cd96a9..0a226bd1306 100644 --- a/internal/traceprof/traceproftest/go.mod +++ b/internal/traceprof/traceproftest/go.mod @@ -13,7 +13,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/internal/traceprof/traceproftest/go.sum b/internal/traceprof/traceproftest/go.sum index 8765a5609b6..895ec3351cb 100644 --- a/internal/traceprof/traceproftest/go.sum +++ b/internal/traceprof/traceproftest/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/orchestrion/all/go.mod b/orchestrion/all/go.mod index 133da1c369d..12c35984244 100644 --- a/orchestrion/all/go.mod +++ b/orchestrion/all/go.mod @@ -51,7 +51,7 @@ require ( cloud.google.com/go/iam v1.1.7 // indirect cloud.google.com/go/pubsub v1.37.0 // indirect github.com/99designs/gqlgen v0.17.36 // indirect - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/orchestrion/all/go.sum b/orchestrion/all/go.sum index e3d1df502a4..df9c70128c3 100644 --- a/orchestrion/all/go.sum +++ b/orchestrion/all/go.sum @@ -21,8 +21,8 @@ github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1r github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/tools/v2check/_stage/go.mod b/tools/v2check/_stage/go.mod index 6e6c7f49148..20e099fb3e4 100644 --- a/tools/v2check/_stage/go.mod +++ b/tools/v2check/_stage/go.mod @@ -8,7 +8,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/tools/v2check/_stage/go.sum b/tools/v2check/_stage/go.sum index 1cd4d4304cf..fd2ea134ae4 100644 --- a/tools/v2check/_stage/go.sum +++ b/tools/v2check/_stage/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8= diff --git a/tools/v2check/go.mod b/tools/v2check/go.mod index eaa233fa664..822028b410f 100644 --- a/tools/v2check/go.mod +++ b/tools/v2check/go.mod @@ -9,7 +9,7 @@ require ( ) require ( - github.com/DataDog/appsec-internal-go v1.9.0 // indirect + github.com/DataDog/appsec-internal-go v1.11.2 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.64.0-rc.1 // indirect diff --git a/tools/v2check/go.sum b/tools/v2check/go.sum index a51ffa429a8..2c036066935 100644 --- a/tools/v2check/go.sum +++ b/tools/v2check/go.sum @@ -1,5 +1,5 @@ -github.com/DataDog/appsec-internal-go v1.9.0 h1:cGOneFsg0JTRzWl5U2+og5dbtyW3N8XaYwc5nXe39Vw= -github.com/DataDog/appsec-internal-go v1.9.0/go.mod h1:wW0cRfWBo4C044jHGwYiyh5moQV2x0AhnwqMuiX7O/g= +github.com/DataDog/appsec-internal-go v1.11.2 h1:Q00pPMQzqMIw7jT2ObaORIxBzSly+deS0Ely9OZ/Bj0= +github.com/DataDog/appsec-internal-go v1.11.2/go.mod h1:9YppRCpElfGX+emXOKruShFYsdPq7WEPq/Fen4tYYpk= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1 h1:XHITEDEb6NVc9n+myS8KJhdK0vKOvY0BTWSFrFynm4s= github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-rc.1/go.mod h1:lzCtnMSGZm/3RMk5RBRW/6IuK1TNbDXx1ttHTxN5Ykc= github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-rc.1 h1:63L66uiNazsZs1DCmb5aDv/YAkCqn6xKqc0aYeATkQ8=