Skip to content

Westphalrafael/merge master to 3.0 #2368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rafaelwestphal wants to merge 5 commits into
base: ops_agent_3.0
Choose a base branch
from
Draft

Westphalrafael/merge master to 3.0 #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e400ddc
Merge branch 'master' into ops_agent_3.0
rafaelwestphal Jun 19, 2026
6116c9f
Update Go version to 1.26.4 and update goldens for OTel v0.154.0 on 3.0
rafaelwestphal Jun 19, 2026
104c31d
Remove fluent-bit submodule from index
rafaelwestphal Jun 19, 2026
4df8776
chore(otel): update opentelemetry-operations-collector submodule to l…
rafaelwestphal Jun 26, 2026
61cb4ff
Merge remote-tracking branch 'origin/ops_agent_3.0' into westphalrafa…
rafaelwestphal Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion submodules/opentelemetry-operations-collector
Open in desktop
Submodule opentelemetry-operations-collector updated 38 files
+78 −0 .agents/skills/distrogen/SKILL.md
+3 −3 Makefile
+66 −0 cmd/distrogen/component_test.go
+151 −0 cmd/distrogen/distribution.go
+54 −0 cmd/distrogen/main.go
+18 −5 cmd/distrogen/templates/distribution/Makefile.go.tmpl
+7 −0 cmd/distrogen/templates/distribution/manifest.yaml.go.tmpl
+24 −5 cmd/distrogen/templates/project/Makefile.go.tmpl
+11 −5 cmd/distrogen/testdata/generator/distribution/basic/golden/Makefile
+11 −5 cmd/distrogen/testdata/generator/distribution/boringcrypto/golden/Makefile
+11 −5 cmd/distrogen/testdata/generator/distribution/build_container/golden/Makefile
+11 −5 cmd/distrogen/testdata/generator/distribution/custom_templates_subdir/golden/Makefile
+11 −5 cmd/distrogen/testdata/generator/distribution/go_proxy/golden/Makefile
+11 −5 cmd/distrogen/testdata/generator/distribution/no_docker_repo/golden/Makefile
+12 −5 cmd/distrogen/testdata/generator/distribution/permanent_ocb_dir/golden/Makefile
+12 −5 cmd/distrogen/testdata/generator/distribution/vendor_dependencies/golden/Makefile
+3 −5 cmd/distrogen/testdata/generator/project/basic/golden/Makefile
+1 −1 cmd/distrogen/testdata/generator/project/vendoring/golden/.distrogen/VERSION
+31 −14 cmd/distrogen/testdata/generator/project/vendoring/golden/.distrogen/spec.yaml
+12 −6 cmd/distrogen/testdata/generator/project/vendoring/golden/Makefile
+2 −2 cmd/distrogen/testdata/generator/project/vendoring/golden/go.mod
+54 −0 cmd/distrogen/testdata/generator/project/vendoring/golden/spec.yaml
+54 −0 cmd/distrogen/testdata/generator/project/vendoring/spec.yaml
+22 −0 cmd/distrogen/testdata/update_spec/append_struct_to_array_via_stdin.yaml
+10 −0 cmd/distrogen/testdata/update_spec/append_to_array_via_scalar.yaml
+5 −0 cmd/distrogen/testdata/update_spec/ignored_field_error.yaml
+5 −0 cmd/distrogen/testdata/update_spec/invalid_field_name_error.yaml
+5 −0 cmd/distrogen/testdata/update_spec/missing_array_error.yaml
+5 −0 cmd/distrogen/testdata/update_spec/missing_intermediate_struct_error.yaml
+9 −0 cmd/distrogen/testdata/update_spec/successful_update_preserves_comments.yaml
+78 −0 cmd/distrogen/update_spec_test.go
+11 −0 docs/distrogen/command.md
+4 −0 docs/distrogen/distribution.md
+12 −5 google-built-opentelemetry-collector/Makefile
+12 −6 otelopscol/Makefile
+6 −0 otelopscol/manifest.yaml
+1 −1 otelopscol/spec.yaml
+1 −1 specs/otelopscol.yaml
92 changes: 0 additions & 92 deletions transformation_test/testdata/logging_processor-iis/output_otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
- resourceLogs:
- resource:
attributes:
Expand Down Expand Up @@ -219,94 +218,3 @@
observedTimeUnixNano: now
timeUnixNano: "1771525729000000000"
scope: {}
=======
- entries:
- httpRequest:
referer: http://localhost/
remoteIp: "::1"
requestMethod: GET
requestUrl: /iisstart.png
serverIp: "::1:80"
status: 200
userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
jsonPayload:
sc_substatus: "0"
sc_win32_status: "0"
time_taken: "18"
labels:
compute.googleapis.com/resource_name: hostname
logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
logName: projects/my-project/logs/my-log-name
resource:
labels:
instance_id: test-instance-id
zone: test-zone
type: gce_instance
timestamp: 2022-03-11T01:26:30Z
- httpRequest:
remoteIp: "::1"
requestMethod: GET
requestUrl: /
serverIp: "::1:80"
status: 200
userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
jsonPayload:
sc_substatus: "0"
sc_win32_status: "0"
time_taken: "352"
labels:
compute.googleapis.com/resource_name: hostname
logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
logName: projects/my-project/logs/my-log-name
resource:
labels:
instance_id: test-instance-id
zone: test-zone
type: gce_instance
timestamp: 2022-03-11T01:26:30Z
- httpRequest:
remoteIp: "::1"
requestMethod: GET
requestUrl: /favicon.ico
serverIp: "::1:80"
status: 404
userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
jsonPayload:
sc_substatus: "0"
sc_win32_status: "2"
time_taken: "49"
labels:
compute.googleapis.com/resource_name: hostname
logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
logName: projects/my-project/logs/my-log-name
resource:
labels:
instance_id: test-instance-id
zone: test-zone
type: gce_instance
timestamp: 2022-03-11T01:26:32Z
- httpRequest:
remoteIp: "::1"
requestMethod: GET
requestUrl: /forbidden?something=something
serverIp: "::1:80"
status: 404
userAgent: Mozilla/5.0+(Windows+NT;+Windows+NT+10.0;+en-US)+WindowsPowerShell/5.1.26100.32370
jsonPayload:
cs_bytes: "184"
sc_bytes: "5035"
sc_substatus: "0"
sc_win32_status: "2"
time_taken: "189"
labels:
compute.googleapis.com/resource_name: hostname
logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
logName: projects/my-project/logs/my-log-name
resource:
labels:
instance_id: test-instance-id
zone: test-zone
type: gce_instance
timestamp: 2026-02-19T18:28:49Z
partialSuccess: true
>>>>>>> master
83 changes: 0 additions & 83 deletions transformation_test/testdata/logging_processor-iis_access/output_otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
- resourceLogs:
- resource:
attributes:
Expand Down Expand Up @@ -191,85 +190,3 @@
observedTimeUnixNano: now
timeUnixNano: "1771525729000000000"
scope: {}
=======
- entries:
- httpRequest:
referer: http://localhost/
remoteIp: "::1"
requestMethod: GET
requestUrl: /iisstart.png
serverIp: "::1:80"
status: 200
userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
jsonPayload:
sc_substatus: "0"
sc_win32_status: "0"
time_taken: "18"
labels:
compute.googleapis.com/resource_name: hostname
logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
logName: projects/my-project/logs/my-log-name
resource:
labels:
instance_id: test-instance-id
zone: test-zone
type: gce_instance
timestamp: 2022-03-11T01:26:30Z
- httpRequest:
remoteIp: "::1"
requestMethod: GET
requestUrl: /
serverIp: "::1:80"
status: 200
userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
jsonPayload:
sc_substatus: "0"
sc_win32_status: "0"
time_taken: "352"
labels:
compute.googleapis.com/resource_name: hostname
logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
logName: projects/my-project/logs/my-log-name
resource:
labels:
instance_id: test-instance-id
zone: test-zone
type: gce_instance
timestamp: 2022-03-11T01:26:30Z
- httpRequest:
serverIp: <nil>:<nil>
jsonPayload:
message: "2022-03-10 17:26:32 ::1 GET /favicon.ico - 80 - ::1 Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko - 404 0 2 49 "
labels:
compute.googleapis.com/resource_name: hostname
logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
logName: projects/my-project/logs/my-log-name
resource:
labels:
instance_id: test-instance-id
zone: test-zone
type: gce_instance
timestamp: now
- httpRequest:
remoteIp: "::1"
requestMethod: GET
requestUrl: /forbidden?something=something
serverIp: "::1:80"
status: 404
userAgent: Mozilla/5.0+(Windows+NT;+Windows+NT+10.0;+en-US)+WindowsPowerShell/5.1.26100.32370
jsonPayload:
sc_substatus: "0"
sc_win32_status: "2"
time_taken: "189"
labels:
compute.googleapis.com/resource_name: hostname
logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
logName: projects/my-project/logs/my-log-name
resource:
labels:
instance_id: test-instance-id
zone: test-zone
type: gce_instance
timestamp: 2026-02-19T18:28:49Z
partialSuccess: true
>>>>>>> master
30 changes: 0 additions & 30 deletions transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
- resourceLogs:
- resource:
attributes:
Expand Down Expand Up @@ -78,32 +77,3 @@
spanId: facefeedb0bacafe
traceId: deadcafedeadc0defacefeedb0bacafe
scope: {}
=======
- entries:
- jsonPayload:
logging.googleapis.com/operation:
first: true
id: id
last: true
producer: producer
normal_field: value
labels:
compute.googleapis.com/resource_name: hostname
label1: value1
label2: value2
logName: projects/my-project/logs/my-log-name
resource:
labels:
instance_id: test-instance-id
zone: test-zone
type: gce_instance
severity: WARNING
sourceLocation:
file: file
function: function
line: "1"
spanId: facefeedb0bacafe
timestamp: now
trace: projects/my-project/traces/deadcafedeadc0defacefeedb0bacafe
partialSuccess: true
>>>>>>> master
Loading