Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: humanmade/aws-xray
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.3.6
Choose a base ref
...
head repository: humanmade/aws-xray
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.3.7
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 1, 2024

  1. Fix circleci 

    This needs to be migrated away, but seems 7.4 is there atleast
    @joehoyle
    joehoyle committed Oct 1, 2024
    Loading
    Loading status checks…

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 09541BBFF0C4C795
    Learn about vigilant mode
    Copy the full SHA
    4c669f0 View commit details

  2. Merge pull request #104 from humanmade/fix-circle 

    Fix circleci
    @joehoyle
    joehoyle authored Oct 1, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    2ca810b View commit details

Commits on Dec 2, 2024

  1. Include user agent in Xray traces 

    This is part of the document spec: https://docs.aws.amazon.com/xray/latest/devguide/xray-api-segmentdocuments.html#api-segmentdocuments-http

Fixes humanmade/vantage-backend#1855
    @joehoyle
    joehoyle committed Dec 2, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    3b702a8 View commit details

Commits on Dec 5, 2024

  1. Merge pull request #105 from humanmade/user-agent 

    Include user agent in Xray traces
    @joehoyle
    joehoyle authored Dec 5, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    01a207b View commit details
Showing with 3 additions and 1 deletion.
  1. +1 −1 .circleci/config.yml
  2. +2 −0 inc/namespace.php
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ jobs:
build:
docker:
# Specify the version you desire here
- image: circleci/php:7.2
- image: circleci/php:7.4

steps:
- checkout
2 changes: 2 additions & 0 deletions inc/namespace.php
View file
Original file line number Diff line number Diff line change
@@ -394,6 +394,7 @@ function get_in_progress_trace() : array {
'method' => $_SERVER['REQUEST_METHOD'],
'url' => ( empty( $_SERVER['HTTPS'] ) ? 'http' : 'https' ) . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
'client_ip' => $_SERVER['REMOTE_ADDR'],
'user_agent' => $_SERVER['HTTP_USER_AGENT'],
],
],
'in_progress' => true,
@@ -464,6 +465,7 @@ function get_end_trace() : array {
'method' => $_SERVER['REQUEST_METHOD'],
'url' => ( empty( $_SERVER['HTTPS'] ) ? 'http' : 'https' ) . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
'client_ip' => $_SERVER['REMOTE_ADDR'],
'user_agent' => $_SERVER['HTTP_USER_AGENT'],
],
'response' => [
'status' => http_response_code(),