Skip to content

Commit 56fca21

Browse files
Merge branch 'main' into npm-distroless
2 parents 3c649b2 + 6674686 commit 56fca21

File tree

15 files changed

+2667
-2276
lines changed

15 files changed

+2667
-2276
lines changed

src/ad/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
implementation platform("io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}")
4141
implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${opentelemetryInstrumentationVersion}")
4242

43-
implementation "com.google.api.grpc:proto-google-common-protos:2.58.1",
43+
implementation "com.google.api.grpc:proto-google-common-protos:2.58.2",
4444
"com.google.protobuf:protobuf-java:${protocVersion}",
4545
"javax.annotation:javax.annotation-api:1.3.2",
4646
"io.grpc:grpc-protobuf:${grpcVersion}",
@@ -51,7 +51,7 @@ dependencies {
5151
"io.opentelemetry:opentelemetry-sdk",
5252
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations",
5353
"org.apache.logging.log4j:log4j-core:2.25.0",
54-
"dev.openfeature.contrib.providers:flagd:0.11.9",
54+
"dev.openfeature.contrib.providers:flagd:0.11.10",
5555
'dev.openfeature:sdk:1.15.1'
5656

5757
runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}",

src/email/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ gem "google-protobuf", "~> 4.31.1"
1212

1313
gem "opentelemetry-sdk", "~> 1.8"
1414
gem "opentelemetry-exporter-otlp", "~> 0.30.0"
15-
gem "opentelemetry-instrumentation-all", "~> 0.77.0"
15+
gem "opentelemetry-instrumentation-all", "~> 0.78.0"

src/email/Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ GEM
5858
opentelemetry-api (~> 1.0)
5959
opentelemetry-instrumentation-active_support (~> 0.7)
6060
opentelemetry-instrumentation-base (~> 0.23.0)
61-
opentelemetry-instrumentation-action_pack (0.12.1)
61+
opentelemetry-instrumentation-action_pack (0.12.3)
6262
opentelemetry-api (~> 1.0)
6363
opentelemetry-instrumentation-base (~> 0.23.0)
6464
opentelemetry-instrumentation-rack (~> 0.21)
@@ -83,7 +83,7 @@ GEM
8383
opentelemetry-instrumentation-active_support (0.8.0)
8484
opentelemetry-api (~> 1.0)
8585
opentelemetry-instrumentation-base (~> 0.23.0)
86-
opentelemetry-instrumentation-all (0.77.0)
86+
opentelemetry-instrumentation-all (0.78.0)
8787
opentelemetry-instrumentation-active_model_serializers (~> 0.22.0)
8888
opentelemetry-instrumentation-aws_lambda (~> 0.3.0)
8989
opentelemetry-instrumentation-aws_sdk (~> 0.8.0)
@@ -98,7 +98,7 @@ GEM
9898
opentelemetry-instrumentation-graphql (~> 0.29.0)
9999
opentelemetry-instrumentation-grpc (~> 0.2.0)
100100
opentelemetry-instrumentation-gruf (~> 0.3.0)
101-
opentelemetry-instrumentation-http (~> 0.24.0)
101+
opentelemetry-instrumentation-http (~> 0.25.0)
102102
opentelemetry-instrumentation-http_client (~> 0.23.0)
103103
opentelemetry-instrumentation-koala (~> 0.21.0)
104104
opentelemetry-instrumentation-lmdb (~> 0.23.0)
@@ -163,7 +163,7 @@ GEM
163163
opentelemetry-instrumentation-gruf (0.3.0)
164164
opentelemetry-api (>= 1.0.0)
165165
opentelemetry-instrumentation-base (~> 0.23.0)
166-
opentelemetry-instrumentation-http (0.24.0)
166+
opentelemetry-instrumentation-http (0.25.0)
167167
opentelemetry-api (~> 1.0)
168168
opentelemetry-instrumentation-base (~> 0.23.0)
169169
opentelemetry-instrumentation-http_client (0.23.0)
@@ -289,7 +289,7 @@ DEPENDENCIES
289289
google-protobuf (~> 4.31.1)
290290
net-smtp (~> 0.5.1)
291291
opentelemetry-exporter-otlp (~> 0.30.0)
292-
opentelemetry-instrumentation-all (~> 0.77.0)
292+
opentelemetry-instrumentation-all (~> 0.78.0)
293293
opentelemetry-sdk (~> 1.8)
294294
pony (~> 1.13)
295295
puma (~> 6.6)

0 commit comments

Comments
 (0)