Merge branch 'master' into gai

Author: vickenty

.github/workflows/changelog.yaml

@@ -1,4 +1,8 @@
 name: "Ensure labels"
+
+permissions:
+  pull-requests: read
+
 on: # yamllint disable-line rule:truthy
   pull_request:
     types:

.github/workflows/codeql-analysis.yml

@@ -1,5 +1,9 @@
 name: "CodeQL"
 
+permissions:
+  contents: read
+  checks: write
+
 on:
   push:
     branches: [ master ]

.github/workflows/labeler.yml

@@ -1,4 +1,9 @@
 name: "Pull Request Labeler"
+
+permissions:
+  contents: read
+  pull-requests: write
+
 on:
 - pull_request
 

.github/workflows/release.yaml

@@ -1,5 +1,9 @@
 name: Build
 
+permissions:
+  contents: write
+  pull-requests: write
+
 on:
   pull_request:
   release:

.github/workflows/stale.yml

@@ -1,6 +1,12 @@
 # Configuration for https://github.com/actions/stale
 
 name: "Stale issues and pull requests"
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
 on:
   schedule:
   - cron: "0 5 * * *"

.github/workflows/test.yml

@@ -1,5 +1,8 @@
 name: test
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:

.github/workflows/test_integration.yml

@@ -1,5 +1,8 @@
 name: Run Integration Tests
 
+permissions:
+  contents: read
+
 on: # yamllint disable-line rule:truthy
   pull_request:
     types:

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.50.1 / 2024-09-18
+
+* [Added] Add the ability for buffering and aggregation to work at the same time. See [#851](https://github.com/DataDog/datadogpy/pull/851).
+
+## v0.50.0 / 2024-08-20
+
+* [Added] Add client side aggregation. See [#844](https://github.com/DataDog/datadogpy/pull/844).
+* [Added] Add metric object type. See [#837](https://github.com/DataDog/datadogpy/pull/837).
+* [Added] Support passing Unix timestamps to dogstatsd. See [#831](https://github.com/DataDog/datadogpy/pull/831).
+* [Fixed] Fix a potential deadlock on fork. See [#836](https://github.com/DataDog/datadogpy/pull/836).
+* [Changed] feat(origin detection): send both container ID and Entity ID. See [#828](https://github.com/DataDog/datadogpy/pull/828).
+
 ## 0.49.1 / 2024-03-18
 
 * [Fixed] Fix potential metric loss when open_buffer is combined with disable_buffering=False. See [#820](https://github.com/DataDog/datadogpy/pull/820).

RELEASING.md

@@ -21,7 +21,7 @@ This project does not have a strict release schedule. However, we would make a r
 Our team will trigger the release pipeline.
 
 ### Prerequisite 
-- Install [datadog_checks_dev](https://datadog-checks-base.readthedocs.io/en/latest/datadog_checks_dev.cli.html#installation) using Python 3.
+- Install [datadog_checks_dev](https://datadoghq.dev/integrations-core/setup/#ddev) using Python 3.
 - Setup PyPI, see the internal documentation for more details
 
 ### Update Changelog and version

datadog/__init__.py

@@ -37,9 +37,9 @@ def initialize(
     api_host=None,  # type: Optional[str]
     statsd_host=None,  # type: Optional[str]
     statsd_port=None,  # type: Optional[int]
-    statsd_disable_aggregator=True,  # type: bool
+    statsd_disable_aggregation=True,  # type: bool
     statsd_disable_buffering=True,  # type: bool
-    statsd_aggregation_flush_interval=2,  # type: float
+    statsd_aggregation_flush_interval=0.3,  # type: float
     statsd_use_default_route=False,  # type: bool
     statsd_socket_path=None,  # type: Optional[str]
     statsd_namespace=None,  # type: Optional[str]
@@ -78,12 +78,13 @@ def initialize(
                                      (default: True).
     :type statsd_disable_buffering: boolean
 
-    :param statsd_disable_aggregator: Enable/disable statsd client aggregation support
+    :param statsd_disable_aggregation: Enable/disable statsd client aggregation support
                                      (default: True).
-    :type statsd_disable_aggregator: boolean
+    :type statsd_disable_aggregation: boolean
 
-    :param statsd_aggregation_flush_interval: Sets the flush interval for aggregation
-                                     (default: 2 seconds)
+    :param statsd_aggregation_flush_interval: If aggregation is enabled, set the flush interval for
+                    aggregation/buffering
+                                     (default: 0.3 seconds)
     :type statsd_aggregation_flush_interval: float
 
     :param statsd_use_default_route: Dynamically set the statsd host to the default route
@@ -138,7 +139,7 @@ def initialize(
     if statsd_constant_tags:
         statsd.constant_tags += statsd_constant_tags
 
-    if statsd_disable_aggregator:
+    if statsd_disable_aggregation:
         statsd.disable_aggregation()
     else:
         statsd.enable_aggregation(statsd_aggregation_flush_interval)