Skip to content
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.

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

[receiver/jmx] Add metric gatherer to artifacts #3262

Merged
merged 143 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
3ef91f4
[receiver/jmx] Add Docker support for JMX receiver
crobert-1 Apr 28, 2023
8da94a7
Add back accidental deletion
crobert-1 Jun 14, 2023
f8206b0
Updated based on Jeff's comments
crobert-1 Jun 30, 2023
91ab283
Fix import order
crobert-1 Jul 11, 2023
31b6ea0
Update cmd/otelcol/Dockerfile.windows
crobert-1 Jul 11, 2023
b80f572
Update cmd/otelcol/Dockerfile.windows
crobert-1 Jul 11, 2023
32fc072
Download from github instead of maven
crobert-1 Jul 11, 2023
bdbe71f
Add missing space
crobert-1 Jul 11, 2023
ce0cdeb
Fix version numbering
crobert-1 Jul 11, 2023
a3d183c
Update version style for new remote repo
crobert-1 Jul 11, 2023
952e423
Add v back for versioning download
crobert-1 Jul 11, 2023
a0d0cf5
Update cmd/otelcol/Dockerfile.windows
crobert-1 Jul 12, 2023
7946c56
Update cmd/otelcol/Dockerfile.windows
crobert-1 Jul 12, 2023
5617145
Update file names to match downloaded files
crobert-1 Jul 12, 2023
96b2257
Fix sprintf formatting
crobert-1 Jul 12, 2023
7c2187a
Ensure required directories exist
crobert-1 Jul 13, 2023
8736eec
Remove unecessary steps
crobert-1 Jul 13, 2023
81041c7
Make container delay longer, curl into specific filename
crobert-1 Jul 14, 2023
13f5ce4
Rename JAR files to match default JMX path
crobert-1 Jul 14, 2023
495563a
Fix variable syntax in config file
crobert-1 Jul 14, 2023
c3ebf5a
Fix jmx integration test
crobert-1 Jul 17, 2023
8c48cdc
Increase timeout to see if integration test will pass
crobert-1 Jul 17, 2023
99cdd6d
Update cmd/otelcol/Dockerfile.windows
crobert-1 Jul 18, 2023
f597d5b
Update cmd/otelcol/Dockerfile.windows
crobert-1 Jul 18, 2023
b64a0ac
Fix integration test
crobert-1 Jul 18, 2023
a625462
Remove integration test
crobert-1 Jul 18, 2023
f9293f0
Add check for jmx jar path in windows MSI
crobert-1 Jul 18, 2023
9db557d
Update path setting in windows dockerfile
crobert-1 Jul 18, 2023
dce7d2d
Fix path setting variable in windows dockerfile
crobert-1 Jul 18, 2023
d406c77
Try another variation of dockerfile windows path
crobert-1 Jul 18, 2023
9618705
Another try at the path syntax
crobert-1 Jul 18, 2023
594f034
Remove extra path arguments
crobert-1 Jul 18, 2023
fd9b894
Use servercore syntax for setting path
crobert-1 Jul 18, 2023
3e5d5d7
Add missing terminator
crobert-1 Jul 18, 2023
96f2b34
Match servercore
crobert-1 Jul 18, 2023
6a13123
Move around values
crobert-1 Jul 18, 2023
ed661c4
Try another format for path
crobert-1 Jul 18, 2023
c19dd6a
Add integration tests back in
crobert-1 Jul 18, 2023
c8545a3
Ran make fmt
crobert-1 Jul 18, 2023
4e37978
Get path a different way
crobert-1 Jul 18, 2023
a9b978f
Try debugging failure
crobert-1 Jul 18, 2023
1b6dc57
Change tmp dir's name
crobert-1 Jul 18, 2023
d43470a
Change temp dir's permission
crobert-1 Jul 18, 2023
7d0be25
Try base case without any temp dir
crobert-1 Jul 19, 2023
b5b33f7
Manually create tmp dir and mount it
crobert-1 Jul 19, 2023
3157e7c
Remove extra will fail call
crobert-1 Jul 19, 2023
7da95a7
Regular mount, made tmpdir with all permissions
crobert-1 Jul 19, 2023
848d616
Create tmp dir in scratch docker image
crobert-1 Jul 19, 2023
76986aa
Update Java version and re-use with different format
crobert-1 Jul 21, 2023
8be0ba9
Use powershell for string replacement
crobert-1 Jul 21, 2023
aa6cd51
Fix powershell command formatting
crobert-1 Jul 21, 2023
c968146
Fix formatting again
crobert-1 Jul 21, 2023
fbabb06
Try another powershell formatting
crobert-1 Jul 21, 2023
84a2a05
Update variable reference to env reference
crobert-1 Jul 21, 2023
7f5fedb
Fix syntax
crobert-1 Jul 21, 2023
bbc0a7e
Remove command option
crobert-1 Jul 21, 2023
05bf1cd
Try moving variable outside parenthesis
crobert-1 Jul 21, 2023
007edc1
Use explicit setenv method of powershell
crobert-1 Jul 21, 2023
adc42c2
Name directory generic name
crobert-1 Jul 21, 2023
1d06994
Try to see if tmp dir is reason tests are failing
crobert-1 Jul 24, 2023
11c684a
Mount local tmpdir for test only
crobert-1 Jul 24, 2023
9400dff
Manually set local tmp if not set
crobert-1 Jul 24, 2023
67b73bf
Skip integration test when running on arm
crobert-1 Jul 27, 2023
39afea0
Fix whitespace
crobert-1 Jul 27, 2023
3d93e59
Change method to find arch running test
crobert-1 Jul 28, 2023
f5767d9
Try env variable for go arch
crobert-1 Jul 28, 2023
781f2cc
Add test data for ARM architecture
crobert-1 Jul 28, 2023
1c03302
Add comment about arm test check
crobert-1 Jul 28, 2023
946d192
Update .github/workflows/win-package-test.yml
crobert-1 Jul 28, 2023
11b9c0f
Update cmd/otelcol/Dockerfile
crobert-1 Jul 28, 2023
5c0f1bc
Changes suggested by Jeff
crobert-1 Jul 28, 2023
c712094
Add component ref for JMX gatherer
crobert-1 Jul 28, 2023
3a67f96
Add changelog entry
crobert-1 Jul 28, 2023
e1793c3
Add PR link
crobert-1 Jul 28, 2023
2a0afe7
add tmpdir to images
rmfitzpatrick Jul 31, 2023
4fb2284
Bump boto3 in /internal/buildscripts/packaging/release (#3425)
dependabot[bot] Jul 31, 2023
5801c64
Bump github.com/aws/aws-sdk-go from 1.44.280 to 1.44.312 in /internal…
dependabot[bot] Jul 31, 2023
a4b7b9c
Bump github.com/snowflakedb/gosnowflake from 1.6.22 to 1.6.23 in /int…
dependabot[bot] Jul 31, 2023
ac3791e
Bump github.com/docker/docker from 24.0.4+incompatible to 24.0.5+inco…
dependabot[bot] Jul 31, 2023
29e9bcb
Bump github.com/docker/docker in /tests (#3432)
dependabot[bot] Jul 31, 2023
34b1a99
Bump org.apache.commons:commons-lang3 (#3434)
dependabot[bot] Jul 31, 2023
1f06e68
Bump github.com/prometheus/prometheus from 0.45.0 to 0.46.0 (#3433)
dependabot[bot] Jul 31, 2023
473a422
Upgrade go to 1.20.6 (#3437)
jeffreyc-splunk Jul 31, 2023
77490ea
Bump github.com/google/cadvisor from 0.47.1 to 0.47.3 in /internal/si…
dependabot[bot] Jul 31, 2023
cd694e4
Bump github.com/prometheus/prometheus (#3435)
dependabot[bot] Jul 31, 2023
e071bb1
Update OpenTelemetry Dependencies to latest (#3436)
srv-gh-o11y-gdi Aug 1, 2023
40403ee
Cherry-pick a fix for resource detection processor (#3438)
dmitryax Aug 1, 2023
73aab12
Revert "Revert "OTL-2195: Disable fluentd by default in installer scr…
jeffreyc-splunk Aug 1, 2023
12cb13a
OTL-2195: Disable fluentd by default for choco package (#3377)
jeffreyc-splunk Aug 1, 2023
331ac2d
set TMPDIR in docker image
rmfitzpatrick Aug 1, 2023
4856c43
remove unnecesary fixtures and mount
rmfitzpatrick Aug 2, 2023
bb6bd07
Merge branch 'main' of github.com:signalfx/splunk-otel-collector into…
rmfitzpatrick Aug 2, 2023
68e31cc
update gatherer version
rmfitzpatrick Aug 2, 2023
f55ec94
Merge branch 'main' of github.com:signalfx/splunk-otel-collector into…
rmfitzpatrick Aug 7, 2023
a7b3916
Merge branch 'main' of github.com:signalfx/splunk-otel-collector into…
rmfitzpatrick Aug 8, 2023
c8750ef
use standard tmp dir in docker image
rmfitzpatrick Aug 8, 2023
7b0f1af
Merge branch 'main' of github.com:signalfx/splunk-otel-collector into…
rmfitzpatrick Aug 9, 2023
7982107
Merge branch 'main' of github.com:signalfx/splunk-otel-collector into…
rmfitzpatrick Aug 10, 2023
e244b92
fix telegraf-exec test tmp race
rmfitzpatrick Aug 10, 2023
8bf0801
fix windows jdk path
rmfitzpatrick Aug 14, 2023
345e3ea
use jre instead of jdk and disable java otlp log exporter
rmfitzpatrick Aug 14, 2023
3cdbc22
Bump pygithub in /internal/buildscripts/packaging/release (#3490)
dependabot[bot] Aug 14, 2023
0873fee
Bump github.com/openzipkin/zipkin-go from 0.4.1 to 0.4.2 in /pkg/rece…
dependabot[bot] Aug 14, 2023
c66623a
Bump boto3 in /internal/buildscripts/packaging/release (#3491)
dependabot[bot] Aug 14, 2023
491e4aa
Bump golang.org/x/tools from 0.11.1 to 0.12.0 in /internal/tools (#3494)
dependabot[bot] Aug 14, 2023
eb77e33
Bump golang in /examples/prometheus-federation/prom-counter (#3493)
dependabot[bot] Aug 14, 2023
3e92203
Bump github.com/golangci/golangci-lint in /internal/tools (#3496)
dependabot[bot] Aug 14, 2023
1f88e5a
Workaround for windows installer script signing (#3505)
jeffreyc-splunk Aug 14, 2023
ae5757d
Bump github.com/antonmedv/expr from 1.12.6 to 1.13.0 in /internal/sig…
dependabot[bot] Aug 14, 2023
188bc51
Bump golang.org/x/net from 0.12.0 to 0.14.0 in /internal/signalfx-age…
dependabot[bot] Aug 14, 2023
4c9d8d4
Add a github issue template to send folks to support and splunk ideas…
atoulme Aug 14, 2023
02a9f68
Bump golang in /examples/splunk-hec-traces/tracing (#3495)
dependabot[bot] Aug 14, 2023
ede0c20
Bump golang in /examples/splunk-hec/logging (#3497)
dependabot[bot] Aug 14, 2023
80ddb19
Bump github.com/hashicorp/consul/api in /internal/signalfx-agent (#3500)
dependabot[bot] Aug 14, 2023
d0679d0
Bump github.com/hashicorp/golang-lru from 0.6.0 to 1.0.2 in /internal…
dependabot[bot] Aug 14, 2023
30ca3cd
Bump github.com/beevik/ntp from 1.2.0 to 1.3.0 in /internal/signalfx-…
dependabot[bot] Aug 14, 2023
1a815d3
corect changelog
rmfitzpatrick Aug 15, 2023
ced2890
Merge branch 'main' of github.com:signalfx/splunk-otel-collector into…
rmfitzpatrick Aug 15, 2023
afc2d3e
update default msi gatherer version
rmfitzpatrick Aug 15, 2023
6cc2cf1
Merge branch 'main' of github.com:signalfx/splunk-otel-collector into…
rmfitzpatrick Aug 16, 2023
d4c84b0
remove arm-specific telegraf-proctstat test metrics
rmfitzpatrick Aug 16, 2023
9d9bd54
Merge branch 'main' of github.com:signalfx/splunk-otel-collector into…
rmfitzpatrick Aug 21, 2023
1cace05
corect cl entry location
rmfitzpatrick Aug 21, 2023
6837806
Merge branch 'main' into jmx_integration
crobert-1 Aug 23, 2023
a782056
update jmx gatherer to 1.29.0
rmfitzpatrick Aug 25, 2023
4901d5c
Merge branch 'main' of github.com:signalfx/splunk-otel-collector into…
rmfitzpatrick Aug 25, 2023
7bcfe6a
Update .gitlab/update-openjdk.sh
rmfitzpatrick Aug 28, 2023
9334a87
Update cmd/otelcol/Dockerfile
rmfitzpatrick Aug 28, 2023
5f40455
move autoconfigure env vars to int test
rmfitzpatrick Aug 28, 2023
a0ccf85
Changes requested in PR
crobert-1 Aug 30, 2023
1a6d47b
Add missing parenthesis
crobert-1 Aug 30, 2023
b2ae714
Fix string comparison
crobert-1 Aug 31, 2023
b7d7667
Fix missing paren
crobert-1 Aug 31, 2023
fd3a7e9
Add test to make sure jar is installed properly
crobert-1 Sep 1, 2023
0f87e4c
Test paths for jmx jar
crobert-1 Sep 1, 2023
ed3b209
Update install path for jmx jar
crobert-1 Sep 1, 2023
073a072
Pass in version for jmx download method
crobert-1 Sep 1, 2023
b7b3513
Move install path of jmx jar
crobert-1 Sep 1, 2023
6db2787
Update tests/receivers/jmxreceiver/jmxreceiver_test.go
crobert-1 Sep 5, 2023
7379f97
Update internal/buildscripts/packaging/msi/msi-builder/Dockerfile
crobert-1 Sep 5, 2023
297a7db
Update internal/buildscripts/packaging/msi/msi-builder/build.sh
crobert-1 Sep 5, 2023
893474c
Merge branch 'main' into jmx_integration
crobert-1 Sep 7, 2023
5cb0177
Merge branch 'main' into jmx_integration
atoulme Sep 7, 2023
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
Prev Previous commit
Next Next commit
Changes requested in PR
- Add java check in windows docker
- Add jmx gatherer to tar
  • Loading branch information
crobert-1 committed Aug 30, 2023
commit a0ccf854b4af3bb089aa0cab44416ec078789707
6 changes: 6 additions & 0 deletions .github/workflows/win-package-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -371,3 +371,9 @@ jobs:
echo "Failing job execution: fail to start otelcol docker container in 10 seconds."
exit 1
}

$JavaCmdOutput=$(docker exec -it otelcol java -version)
if ( !contains($JavaCmdOutput, 'openjdk version' ) {
docker logs otelcol
echo "Failing job execution: Failed to run java, command output: ${JavaCmdOutput}"
}
8 changes: 8 additions & 0 deletions internal/buildscripts/packaging/fpm/tar/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ tar_setup_files_and_permissions() {
sudo chown -R root:root "$buildroot/$BUNDLE_BASE_DIR"
sudo chmod -R 755 "$buildroot/$BUNDLE_BASE_DIR"
fi

JMX_INSTALL_PATH="$buildroot/opt/opentelemetry-java-contrib-jmx-metrics.jar"
if [[ -e "$JMX_INSTALL_PATH" ]]; then
sudo chown root:root "$JMX_INSTALL_PATH"
sudo chmod 755 "$JMX_INSTALL_PATH"
fi
}

if [[ -z "$VERSION" ]]; then
Expand All @@ -69,6 +75,8 @@ agent_bundle_path="$REPO_DIR/dist/agent-bundle_linux_${ARCH}.tar.gz"

buildroot="$(mktemp -d)"

download_jmx_metric_gatherer "$JMX_METRIC_GATHERER_RELEASE_PATH" "$buildroot"

tar_setup_files_and_permissions "$otelcol_path" "$translatesfx_path" "$config_folder_path" "$buildroot" "$agent_bundle_path"

mkdir -p "$OUTPUT_DIR"
Expand Down
Loading