Skip to content

Commit 318f56f

Browse files
committed
Merge branch 'main' into sabrenner/add-llmobs-proxies
2 parents 2330215 + 1662d8b commit 318f56f

19 files changed

+83
-117
lines changed

.gitlab/datasources/flavors.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ flavors:
5454
needs_layer_sign: true
5555
needs_layer_publish: false
5656
suffix: arm64-fips
57-
max_layer_compressed_size_mb: 21
57+
max_layer_compressed_size_mb: 22
5858
max_layer_uncompressed_size_mb: 52
5959

6060
- name: amd64, fips, alpine
@@ -80,27 +80,23 @@ multi_arch_image_flavors:
8080
- name: basic
8181
alpine: 0
8282
fips: 0
83-
platform: linux/amd64,linux/arm64
8483
dependency_names: [amd64, arm64]
8584
suffix: ""
8685

8786
- name: alpine
8887
alpine: 1
8988
fips: 0
90-
platform: linux/amd64,linux/arm64
9189
dependency_names: ["amd64, alpine", "arm64, alpine"]
9290
suffix: "-alpine"
9391

9492
- name: fips
9593
alpine: 0
9694
fips: 1
97-
platform: linux/amd64,linux/arm64
9895
dependency_names: ["amd64, fips", "arm64, fips"]
9996
suffix: "-fips"
10097

10198
- name: fips, alpine
10299
alpine: 1
103100
fips: 1
104-
platform: linux/amd64,linux/arm64
105101
dependency_names: ["amd64, fips, alpine", "arm64, fips, alpine"]
106102
suffix: "-alpine-fips"

.gitlab/scripts/build_image.sh

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@ set -e
1212
DOCKER_TARGET_IMAGE="registry.ddbuild.io/ci/datadog-lambda-extension"
1313
EXTENSION_DIR=".layers"
1414

15-
if [ -z "$ALPINE" ]; then
16-
printf "[ERROR]: ALPINE not specified\n"
17-
exit 1
18-
else
19-
printf "Alpine build requested: ${ALPINE}\n"
20-
fi
21-
2215
if [ -z "$CI_COMMIT_TAG" ]; then
2316
# Running on dev
2417
printf "Running on dev environment\n"
@@ -30,17 +23,10 @@ else
3023
fi
3124

3225

33-
if [ "$ALPINE" = "0" ]; then
34-
printf "Building image\n"
35-
TARGET_IMAGE="Dockerfile.extension_image"
36-
else
37-
printf "Building image for alpine\n"
38-
TARGET_IMAGE="Dockerfile.extension_image.alpine"
39-
fi
40-
4126
docker buildx build \
42-
--platform $PLATFORM \
43-
-f ./images/${TARGET_IMAGE} \
27+
--platform linux/amd64,linux/arm64 \
28+
-f ./images/Dockerfile.extension_image \
29+
--build-arg SUFFIX=$SUFFIX \
4430
--tag "$DOCKER_TARGET_IMAGE:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${SUFFIX}" \
4531
--push .
4632
printf "Image built and pushed to $DOCKER_TARGET_IMAGE:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${SUFFIX} for $PLATFORM\n"

.gitlab/scripts/build_private_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ VERSION=$(($latest_version + 1))
3232
printf "Tagging container image with version: $VERSION and latest\n"
3333

3434
docker buildx build \
35-
--platform $PLATFORM \
35+
--platform linux/amd64,linux/arm64 \
3636
-f ./images/Dockerfile.extension_image \
3737
--build-arg SUFFIX=$SUFFIX \
3838
--tag "$DOCKER_TARGET_IMAGE:${IMAGE_TAG}${SUFFIX}" \

.gitlab/templates/pipeline.yaml.tpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,7 @@ publish private images ({{ $multi_arch_image_flavor.name }}):
246246
- layer ({{ . }})
247247
{{ end }} # end dependency_names
248248
variables:
249-
ALPINE: {{ $multi_arch_image_flavor.alpine }}
250249
SUFFIX: {{ $multi_arch_image_flavor.suffix }}
251-
PLATFORM: {{ $multi_arch_image_flavor.platform }}
252250
before_script:
253251
{{ with $environment := (ds "environments").environments.sandbox }}
254252
- EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
@@ -271,9 +269,7 @@ image ({{ $multi_arch_image_flavor.name }}):
271269
- layer ({{ . }})
272270
{{ end }} # end dependency_names
273271
variables:
274-
ALPINE: {{ $multi_arch_image_flavor.alpine }}
275272
SUFFIX: {{ $multi_arch_image_flavor.suffix }}
276-
PLATFORM: {{ $multi_arch_image_flavor.platform }}
277273
script:
278274
- .gitlab/scripts/build_image.sh
279275

bottlecap/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bottlecap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "4b
1515
datadog-trace-mini-agent = { git = "https://github.com/DataDog/libdatadog", rev = "4ba2f3a7b6bc298035bad8721134a4c34fdd2f1a" }
1616
datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog", rev = "4ba2f3a7b6bc298035bad8721134a4c34fdd2f1a" }
1717
datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "4ba2f3a7b6bc298035bad8721134a4c34fdd2f1a" }
18-
dogstatsd = { git = "https://github.com/DataDog/libdatadog", rev = "7982adc0c6966925f66625ca57759c0d7089a54d" }
18+
dogstatsd = { git = "https://github.com/DataDog/serverless-components", rev = "4dfe72ab1850680f41dd79d30a937eb68e7ba6da" }
1919
figment = { version = "0.10", default-features = false, features = ["yaml", "env"] }
2020
hyper = { version = "0.14", default-features = false, features = ["server"] }
2121
lazy_static = { version = "1.5", default-features = false }

bottlecap/LICENSE-3rdparty.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6445,13 +6445,12 @@ third_party_libraries:
64456445
- license: Apache-2.0
64466446
text: " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\nTERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\nCopyright [yyyy] [name of copyright owner]\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n\thttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n"
64476447
- package_name: dogstatsd
6448-
package_version: 16.0.3
6448+
package_version: 0.1.0
64496449
repository: ''
64506450
license: Apache-2.0
64516451
licenses:
64526452
- license: Apache-2.0
64536453
text: |2
6454-
64556454
Apache License
64566455
Version 2.0, January 2004
64576456
http://www.apache.org/licenses/

bottlecap/src/bin/bottlecap/main.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ use bottlecap::{
1515
event_bus::bus::EventBus,
1616
events::Event,
1717
lifecycle::{
18-
flush_control::FlushControl,
19-
invocation::{context::ContextBuffer, processor::Processor as InvocationProcessor},
18+
flush_control::FlushControl, invocation::processor::Processor as InvocationProcessor,
2019
listener::Listener as LifecycleListener,
2120
},
2221
logger,
@@ -330,20 +329,18 @@ async fn extension_loop_active(
330329
let mut metrics_flusher =
331330
start_metrics_flusher(resolved_api_key.clone(), &metrics_aggr, config);
332331
// Lifecycle Invocation Processor
333-
let context_buffer = Arc::new(Mutex::new(ContextBuffer::default()));
334332
let invocation_processor = Arc::new(TokioMutex::new(InvocationProcessor::new(
335333
Arc::clone(&tags_provider),
336334
Arc::clone(config),
337335
aws_config,
338336
Arc::clone(&metrics_aggr),
339-
Arc::clone(&context_buffer),
340337
)));
341338

342339
let (trace_agent_channel, trace_flusher, trace_processor, stats_flusher) = start_trace_agent(
343340
config,
344341
resolved_api_key.clone(),
345342
&tags_provider,
346-
context_buffer.clone(),
343+
Arc::clone(&invocation_processor),
347344
);
348345

349346
let lifecycle_listener = LifecycleListener {
@@ -695,7 +692,7 @@ fn start_trace_agent(
695692
config: &Arc<Config>,
696693
resolved_api_key: String,
697694
tags_provider: &Arc<TagProvider>,
698-
context_buffer: Arc<Mutex<ContextBuffer>>,
695+
invocation_processor: Arc<TokioMutex<InvocationProcessor>>,
699696
) -> (
700697
Sender<datadog_trace_utils::send_data::SendData>,
701698
Arc<trace_flusher::ServerlessTraceFlusher>,
@@ -739,8 +736,8 @@ fn start_trace_agent(
739736
trace_processor.clone(),
740737
stats_aggregator,
741738
stats_processor,
739+
invocation_processor,
742740
Arc::clone(tags_provider),
743-
context_buffer,
744741
resolved_api_key,
745742
));
746743
let trace_agent_channel = trace_agent.get_sender_copy();

0 commit comments

Comments
 (0)