Skip to content

Commit 01b021c

Browse files
michaelvanstratenjjjalkanen
authored andcommitted
Bug 1991427 - Switch otel-proto definitions to use LITE_RUNTIME r=jari
This should reduce the number of static ctors as well as being related to Bug 1816848, although this might not have been the cause. Differential Revision: https://phabricator.services.mozilla.com/D266666
1 parent 9f238f9 commit 01b021c

File tree

4 files changed

+57
-3
lines changed

4 files changed

+57
-3
lines changed

third_party/opentelemetry-cpp/moz.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ DIRS += [
99
"sdk/src",
1010
]
1111

12-
1312
TEST_DIRS += ["exporters/memory"]
1413

1514
with Files("**"):

third_party/opentelemetry-cpp/third_party/opentelemetry-proto/moz.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ vendoring:
4646
- opentelemetry/proto/trace/v1/trace.pb.cc
4747
- opentelemetry/proto/trace/v1/trace.pb.h
4848

49-
update-actions:
49+
patches:
50+
- patches/add-lite_runtime-optimization-to-protos.patch
51+
52+
post-patch-actions:
5053
- action: run-script
5154
script: "{topsrcdir}/toolkit/components/protobuf/scripts/protoc_wrapper.py"
5255
cwd: "{topsrcdir}"
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
diff --git a/opentelemetry/proto/collector/trace/v1/trace_service.proto b/opentelemetry/proto/collector/trace/v1/trace_service.proto
2+
index efbbedbe4545..6a439642915c 100644
3+
--- a/opentelemetry/proto/collector/trace/v1/trace_service.proto
4+
+++ b/opentelemetry/proto/collector/trace/v1/trace_service.proto
5+
@@ -14,6 +14,8 @@
6+
7+
syntax = "proto3";
8+
9+
+option optimize_for = LITE_RUNTIME;
10+
+
11+
package opentelemetry.proto.collector.trace.v1;
12+
13+
import "opentelemetry/proto/trace/v1/trace.proto";
14+
diff --git a/opentelemetry/proto/common/v1/common.proto b/opentelemetry/proto/common/v1/common.proto
15+
index 57c9f86e0067..452f27edca95 100644
16+
--- a/opentelemetry/proto/common/v1/common.proto
17+
+++ b/opentelemetry/proto/common/v1/common.proto
18+
@@ -14,6 +14,8 @@
19+
20+
syntax = "proto3";
21+
22+
+option optimize_for = LITE_RUNTIME;
23+
+
24+
package opentelemetry.proto.common.v1;
25+
26+
option csharp_namespace = "OpenTelemetry.Proto.Common.V1";
27+
diff --git a/opentelemetry/proto/resource/v1/resource.proto b/opentelemetry/proto/resource/v1/resource.proto
28+
index 05d4456840f4..54c9471466f2 100644
29+
--- a/opentelemetry/proto/resource/v1/resource.proto
30+
+++ b/opentelemetry/proto/resource/v1/resource.proto
31+
@@ -14,6 +14,8 @@
32+
33+
syntax = "proto3";
34+
35+
+option optimize_for = LITE_RUNTIME;
36+
+
37+
package opentelemetry.proto.resource.v1;
38+
39+
import "opentelemetry/proto/common/v1/common.proto";
40+
diff --git a/opentelemetry/proto/trace/v1/trace.proto b/opentelemetry/proto/trace/v1/trace.proto
41+
index 24442853edcf..c6470638a97a 100644
42+
--- a/opentelemetry/proto/trace/v1/trace.proto
43+
+++ b/opentelemetry/proto/trace/v1/trace.proto
44+
@@ -14,6 +14,8 @@
45+
46+
syntax = "proto3";
47+
48+
+option optimize_for = LITE_RUNTIME;
49+
+
50+
package opentelemetry.proto.trace.v1;
51+
52+
import "opentelemetry/proto/common/v1/common.proto";

toolkit/components/protobuf/scripts/protoc_wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def _extract_member(self, member, targetpath, pwd):
6464
if not isinstance(member, ZipInfo):
6565
member = self.getinfo(member)
6666

67-
targetpath = super(ZipFile, self)._extract_member(member, targetpath, pwd)
67+
targetpath = ZipFile._extract_member(self, member, targetpath, pwd)
6868

6969
attr = member.external_attr >> 16
7070
if attr != 0:

0 commit comments

Comments
 (0)