Skip to content

Commit 204348c

Browse files
authored
Merge pull request #66 from castai/bump-deps-147
Bump go and otel versions
2 parents 04babce + b6c5560 commit 204348c

7 files changed

Lines changed: 23 additions & 23 deletions

File tree

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@v3
2222

23-
- name: Setup Go 1.25.3
23+
- name: Setup Go 1.26.1
2424
uses: actions/setup-go@v5
2525
with:
26-
go-version: 1.25.3
26+
go-version: 1.26.1
2727

2828
- name: Install dependency
29-
run: go install go.opentelemetry.io/collector/cmd/builder@v0.138.0
29+
run: go install go.opentelemetry.io/collector/cmd/builder@v0.147.0
3030

3131
- name: Get release tag
3232
if: github.event_name == 'release'

.github/workflows/golangci-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515
- uses: actions/setup-go@v5
1616
with:
17-
go-version: '1.25.3'
17+
go-version: '1.26.1'
1818
- name: Install golangci-lint from source
1919
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
2020
- name: Run golangci-lint

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ GOARCH := $(shell go env GOARCH)
33
.PHONY: setup # Set up required tools (builder, mdatagen)
44
setup:
55
git clone https://github.com/open-telemetry/opentelemetry-collector.git ./opentelemetry-collector
6-
cd ./opentelemetry-collector && git checkout v0.138.0
6+
cd ./opentelemetry-collector && git checkout v0.147.0
77
cd ./opentelemetry-collector/cmd/builder && go build -o builder .
88
cd ./opentelemetry-collector/cmd/mdatagen && go build -o mdatagen .
99

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Example Helm install with Loki configuration:
104104
# values.yaml
105105
config:
106106
exporters:
107-
otlphttp/loki:
107+
otlp_http/loki:
108108
endpoint: http://localhost:3100/otlp
109109

110110
processors:
@@ -117,7 +117,7 @@ config:
117117
- set(resource.attributes["id"], attributes["id"]) where attributes["id"] != nil
118118
- set(resource.attributes["initiatedBy"], attributes["initiatedBy"]["id"]) where attributes["initiatedBy"]["id"] != nil
119119
- set(resource.attributes["clusterId"], attributes["labels"]["clusterId"]) where attributes["labels"]["clusterId"] != nil
120-
120+
121121
# Convert all attributes to JSON string and set as body (always)
122122
- set(body, attributes)
123123

@@ -126,7 +126,7 @@ config:
126126
logs:
127127
receivers: [castai_audit_logs]
128128
processors: [transform]
129-
exporters: [otlphttp/loki]
129+
exporters: [otlp_http/loki]
130130
```
131131
* deploy chart with `--values` flag set to `values.yaml`:
132132
```shell

auditlogsreceiver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/castai/audit-logs-receiver/audit-logs
22

3-
go 1.25.3
3+
go 1.26.1
44

55
require (
66
github.com/go-resty/resty/v2 v2.16.5

builder-config.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ dist:
44
output_path: ./castai-collector
55

66
receivers:
7-
- gomod: github.com/castai/audit-logs-receiver/audit-logs v0.138.0
7+
- gomod: github.com/castai/audit-logs-receiver/audit-logs v0.147.0
88
import: github.com/castai/audit-logs-receiver/audit-logs
99
name: "auditlogsreceiver"
1010
path: "./auditlogsreceiver/"
1111

1212
extensions:
13-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.138.0
13+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0
1414

1515
processors:
16-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.138.0
17-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.138.0
18-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.138.0
19-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.138.0
16+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.147.0
17+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.147.0
18+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.147.0
19+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.147.0
2020

2121

2222
exporters:
23-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.138.0
24-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.138.0
25-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.138.0
26-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.138.0
27-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.138.0
28-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.138.0
23+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.147.0
24+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.147.0
25+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.147.0
26+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.147.0
27+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.147.0
28+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.147.0
2929

examples/loki/collector-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ receivers:
1010
filename: "./audit_logs_poll_data.json"
1111

1212
exporters:
13-
otlphttp/loki:
13+
otlp_http/loki:
1414
endpoint: http://localhost:3100/otlp
1515

1616
processors:
@@ -33,4 +33,4 @@ service:
3333
logs:
3434
receivers: [castai_audit_logs]
3535
processors: [transform]
36-
exporters: [otlphttp/loki]
36+
exporters: [otlp_http/loki]

0 commit comments

Comments
 (0)