Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master' into alex/A…
Browse files Browse the repository at this point in the history
…IDM-529_testing-latest
  • Loading branch information
PROFeNoM committed Jan 22, 2025
2 parents 83bef9e + e44d78d commit 73977f3
Show file tree
Hide file tree
Showing 111 changed files with 1,642 additions and 606 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Bug report
description: Create a report to help us improve
name: "Bug Report (Public)"
description: "Create a public Bug Report. Note that looking up account information will be difficult."
title: "[Bug]: "
labels: ["\U0001F41B bug"]
body:
Expand Down
11 changes: 7 additions & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
blank_issues_enabled: true
blank_issues_enabled: false
contact_links:
- name: Check the docs
url: https://docs.datadoghq.com/tracing/trace_collection/dd_libraries/php/
about: In case you need help with setup and configuration you might find help in the offical documentation
- name: Bug Report (Helpdesk)
url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:php
about: Create a private Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private.
- name: Feature Request (Helpdesk)
url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:php&tf_1260825272270=pt_apm_category_feature_request
about: Create a private Feature Request via the helpdesk (no login required). This helps with prioritization and allows you to provide additional information in private.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Feature request
description: Suggest an idea
name: Feature Request (Public)
description: Create a public Feature Request. Note that looking up account information will be difficult.
title: "[Feature] "
labels: ["feature-request"]
labels: feature-request
body:
- type: textarea
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prof_correctness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
submodules: true

- name: Setup PHP
uses: shivammathur/setup-php@v2
uses: shivammathur/setup-php@2.32.0
with:
php-version: ${{ matrix.php-version }}
extensions: ${{ matrix.extensions }}
Expand Down
122 changes: 24 additions & 98 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Security Policy

This document outlines the security policy for the Datadog PHP client library (aka PHP tracer) and what to do if you discover a security vulnerability in the project.
Most notably, please do not share the details in a public forum (such as in a discussion, issue, or pull request) but instead reach out to us with the details.
This gives us an opportunity to release a fix for others to benefit from by the time details are made public.

## Supported Versions

We accept vulnerability submissions for the [currently maintained release](https://github.com/DataDog/dd-trace-php/releases).

## Reporting a Vulnerability

If you discover a vulnerability in the Datadog PHP client library (or any Datadog product for that matter) please submit details to the following email address:

* [[email protected]](mailto:[email protected])
Loading

0 comments on commit 73977f3

Please sign in to comment.