Skip to content

Commit 962ad1d

Browse files
hmstepanekhmstepanek
authored
Merge pull request #1596 from newrelic/main
Merge changes from main
2 parents 7dad3bb + 1606479 commit 962ad1d

38 files changed

+1275
-717
lines changed

‎.github/workflows/addlicense.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
permissions:
4040
contents: read
4141
steps:
42-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
42+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
4343

4444
- name: Fetch git tags
4545
run: |

‎.github/workflows/benchmarks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
BASE_SHA: ${{ github.event.pull_request.base.sha }}
3939

4040
steps:
41-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
41+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
4242
with:
4343
fetch-depth: 0
4444

45-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # 6.0.0
45+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # 6.1.0
4646
with:
4747
python-version: "${{ matrix.python }}"
4848

‎.github/workflows/build-ci-image.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
name: Docker Build ${{ matrix.platform }}
4444

4545
steps:
46-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
46+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
4747
with:
4848
persist-credentials: false
4949
fetch-depth: 0
@@ -60,7 +60,7 @@ jobs:
6060
6161
- name: Generate Docker Metadata (Tags and Labels)
6262
id: meta
63-
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # 5.9.0
63+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # 5.10.0
6464
with:
6565
images: ghcr.io/${{ steps.image-name.outputs.IMAGE_NAME }}
6666
flavor: |
@@ -139,7 +139,7 @@ jobs:
139139
140140
- name: Generate Docker Metadata (Tags and Labels)
141141
id: meta
142-
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # 5.9.0
142+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # 5.10.0
143143
with:
144144
images: ghcr.io/${{ steps.image-name.outputs.IMAGE_NAME }}
145145
flavor: |

‎.github/workflows/deploy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ${{ matrix.os }}
7070

7171
steps:
72-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
72+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
7373
with:
7474
persist-credentials: false
7575
fetch-depth: 0
@@ -109,12 +109,12 @@ jobs:
109109
runs-on: ubuntu-24.04
110110

111111
steps:
112-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
112+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
113113
with:
114114
persist-credentials: false
115115
fetch-depth: 0
116116

117-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # 6.0.0
117+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # 6.1.0
118118
with:
119119
python-version: "3.13"
120120

‎.github/workflows/mega-linter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ jobs:
4545
steps:
4646
# Git Checkout
4747
- name: Checkout Code
48-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
48+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
4949
with:
5050
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
5151
fetch-depth: 0 # Required for pushing commits to PRs
5252

5353
# MegaLinter
5454
- name: MegaLinter
5555
id: ml
56-
uses: oxsecurity/megalinter/flavors/python@62c799d895af9bcbca5eacfebca29d527f125a57 # 9.1.0
56+
uses: oxsecurity/megalinter/flavors/python@55a59b24a441e0e1943080d4a512d827710d4a9d # 9.2.0
5757
env:
5858
# All available variables are described in documentation
5959
# https://megalinter.io/latest/configuration/

‎.github/workflows/tests.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ jobs:
9393
- tests
9494

9595
steps:
96-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
97-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # 6.0.0
96+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
97+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # 6.1.0
9898
with:
9999
python-version: "3.13"
100100
architecture: x64
@@ -127,8 +127,8 @@ jobs:
127127
- tests
128128

129129
steps:
130-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
131-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # 6.0.0
130+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
131+
- uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # 6.1.0
132132
with:
133133
python-version: "3.13"
134134
architecture: x64
@@ -166,7 +166,7 @@ jobs:
166166
--add-host=host.docker.internal:host-gateway
167167
timeout-minutes: 30
168168
steps:
169-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
169+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
170170

171171
- name: Fetch git tags
172172
run: |
@@ -231,7 +231,7 @@ jobs:
231231
--add-host=host.docker.internal:host-gateway
232232
timeout-minutes: 30
233233
steps:
234-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
234+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
235235

236236
- name: Fetch git tags
237237
run: |
@@ -294,14 +294,14 @@ jobs:
294294
runs-on: windows-2025
295295
timeout-minutes: 30
296296
steps:
297-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
297+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
298298

299299
- name: Fetch git tags
300300
run: |
301301
git fetch --tags origin
302302
303303
- name: Install uv
304-
uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # 7.1.3
304+
uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # 7.1.4
305305

306306
- name: Install Python
307307
run: |
@@ -363,14 +363,14 @@ jobs:
363363
runs-on: windows-11-arm
364364
timeout-minutes: 30
365365
steps:
366-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
366+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
367367

368368
- name: Fetch git tags
369369
run: |
370370
git fetch --tags origin
371371
372372
- name: Install uv
373-
uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # 7.1.3
373+
uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # 7.1.4
374374

375375
- name: Install Python
376376
run: |
@@ -443,7 +443,7 @@ jobs:
443443
--add-host=host.docker.internal:host-gateway
444444
timeout-minutes: 30
445445
steps:
446-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
446+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
447447

448448
- name: Fetch git tags
449449
run: |
@@ -526,7 +526,7 @@ jobs:
526526
--health-retries 10
527527
528528
steps:
529-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
529+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
530530

531531
- name: Fetch git tags
532532
run: |
@@ -606,7 +606,7 @@ jobs:
606606
--health-retries 5
607607
608608
steps:
609-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
609+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
610610

611611
- name: Fetch git tags
612612
run: |
@@ -687,7 +687,7 @@ jobs:
687687
--health-retries 5
688688
689689
steps:
690-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
690+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
691691

692692
- name: Fetch git tags
693693
run: |
@@ -772,7 +772,7 @@ jobs:
772772
# from every being executed as bash commands.
773773

774774
steps:
775-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
775+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
776776

777777
- name: Fetch git tags
778778
run: |
@@ -837,7 +837,7 @@ jobs:
837837
--add-host=host.docker.internal:host-gateway
838838
timeout-minutes: 30
839839
steps:
840-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
840+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
841841

842842
- name: Fetch git tags
843843
run: |
@@ -927,7 +927,7 @@ jobs:
927927
KAFKA_CFG_INTER_BROKER_LISTENER_NAME: L3
928928

929929
steps:
930-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
930+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
931931

932932
- name: Fetch git tags
933933
run: |
@@ -1005,7 +1005,7 @@ jobs:
10051005
--health-retries 5
10061006
10071007
steps:
1008-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1008+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
10091009

10101010
- name: Fetch git tags
10111011
run: |
@@ -1083,7 +1083,7 @@ jobs:
10831083
--health-retries 5
10841084
10851085
steps:
1086-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1086+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
10871087

10881088
- name: Fetch git tags
10891089
run: |
@@ -1161,7 +1161,7 @@ jobs:
11611161
--health-retries 5
11621162
11631163
steps:
1164-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1164+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
11651165

11661166
- name: Fetch git tags
11671167
run: |
@@ -1244,7 +1244,7 @@ jobs:
12441244
--health-retries 5
12451245
12461246
steps:
1247-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1247+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
12481248

12491249
- name: Fetch git tags
12501250
run: |
@@ -1327,7 +1327,7 @@ jobs:
13271327
--health-retries 5
13281328
13291329
steps:
1330-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1330+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
13311331

13321332
- name: Fetch git tags
13331333
run: |
@@ -1406,7 +1406,7 @@ jobs:
14061406
--health-retries 5
14071407
14081408
steps:
1409-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1409+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
14101410

14111411
- name: Fetch git tags
14121412
run: |
@@ -1487,7 +1487,7 @@ jobs:
14871487
--health-retries 5
14881488
14891489
steps:
1490-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1490+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
14911491

14921492
- name: Fetch git tags
14931493
run: |
@@ -1567,7 +1567,7 @@ jobs:
15671567
--health-retries 5
15681568
15691569
steps:
1570-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1570+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
15711571

15721572
- name: Fetch git tags
15731573
run: |
@@ -1647,7 +1647,7 @@ jobs:
16471647
--health-retries 5
16481648
16491649
steps:
1650-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1650+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
16511651

16521652
- name: Fetch git tags
16531653
run: |
@@ -1726,7 +1726,7 @@ jobs:
17261726
--health-retries 5
17271727
17281728
steps:
1729-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1729+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
17301730

17311731
- name: Fetch git tags
17321732
run: |
@@ -1804,7 +1804,7 @@ jobs:
18041804
--health-retries 5
18051805
18061806
steps:
1807-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1807+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
18081808

18091809
- name: Fetch git tags
18101810
run: |
@@ -1923,7 +1923,7 @@ jobs:
19231923
--add-host=host.docker.internal:host-gateway
19241924
19251925
steps:
1926-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
1926+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
19271927

19281928
- name: Fetch git tags
19291929
run: |
@@ -2003,7 +2003,7 @@ jobs:
20032003
--health-retries 5
20042004
20052005
steps:
2006-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
2006+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
20072007

20082008
- name: Fetch git tags
20092009
run: |
@@ -2081,7 +2081,7 @@ jobs:
20812081
--health-retries 5
20822082
20832083
steps:
2084-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
2084+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
20852085

20862086
- name: Fetch git tags
20872087
run: |

‎.github/workflows/trivy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333
# Git Checkout
3434
- name: Checkout Code
35-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
35+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0
3636
with:
3737
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
3838
fetch-depth: 0
@@ -61,6 +61,6 @@ jobs:
6161

6262
- name: Upload Trivy scan results to GitHub Security tab
6363
if: ${{ github.event_name == 'schedule' }}
64-
uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # 4.31.3
64+
uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # 4.31.6
6565
with:
6666
sarif_file: "trivy-results.sarif"

‎newrelic/core/custom_event.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def create_custom_event(event_type, params, settings=None, is_ml_event=False):
141141
)
142142
return None
143143

144-
intrinsics = {"type": name, "timestamp": int(1000.0 * time.time())}
144+
intrinsics = {"type": name, "timestamp": params.get("timestamp") or int(1000.0 * time.time())}
145145

146146
event = [intrinsics, attributes]
147147
return event

‎newrelic/hooks/datastore_redis.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
"hsetnx",
279279
"hstrlen",
280280
"hvals",
281+
"hybrid_search",
281282
"incr",
282283
"incrby",
283284
"incrbyfloat",
@@ -325,6 +326,7 @@
325326
"mrange",
326327
"mrevrange",
327328
"mset",
329+
"msetex",
328330
"msetnx",
329331
"numincrby",
330332
"object_encoding",

0 commit comments

Comments
 (0)