Merge branch 'main' into log-endpoints

Author: Saumya40-codes

.chloggen/add-two-new-vecenter-receiver-metrics.yaml

@@ -0,0 +1,21 @@
+# Use this changelog template to create an entry for release notes.
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: vcenterreceiver
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Adds vCenter memory capacity for hosts and memory granted metric for VMs." 
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues:  [37257]
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

Makefile.Common

@@ -268,11 +268,11 @@ CHANGED_GOLANG_SOURCES?=$(shell git diff main --name-only | grep -E '.*\.go$$' |
 .PHONY: for-affected-components
 for-affected-components:
 	@echo "Checking for affected components..."
-	@if [ -z '$(CHANGED_GOLANG_SOURCES)' ]; then \
+	@if [ -z '$${CHANGED_GOLANG_SOURCES}' ]; then \
 		echo "No go source changes detected in shippable code."; \
 	else \
 		cd $(SRC_ROOT); \
-		DEPENDENT_PKGS=$$(echo $(CHANGED_GOLANG_SOURCES) | xargs sed -n 's|^package .* // import "\(.*\)"$$|\1|p' | uniq); \
+		DEPENDENT_PKGS=$$(echo $${CHANGED_GOLANG_SOURCES} | xargs sed -n 's|^package .* // import "\(.*\)"$$|\1|p' | uniq); \
 		if [ -z '$${DEPENDENT_PKGS}' ]; then \
 			echo "No other package depends on the one being changed."; \
 		else \
@@ -289,11 +289,11 @@ CHANGED_GOLANG_TESTS?=$(shell git diff main --name-only | grep -E '.*_test\.go$$
 .PHONY: run-changed-tests
 run-changed-tests:
 	@echo "Checking for affected tests..."
-	@if [ -z '$(CHANGED_GOLANG_TESTS)' ]; then \
+	@if [ -z '$${CHANGED_GOLANG_TESTS}' ]; then \
 		echo "No go test changes detected."; \
 	else \
 		cd $(SRC_ROOT); \
-		AFFECTED_TEST_DIRS=$$(echo $(CHANGED_GOLANG_TESTS) | tr ' ' '\n' | xargs dirname | uniq); \
+		AFFECTED_TEST_DIRS=$$(echo $${CHANGED_GOLANG_TESTS} | tr ' ' '\n' | xargs dirname | uniq); \
 		if [ -z '$${AFFECTED_TEST_DIRS}' ]; then \
 			echo "Failed to find the affected test directories."; \
 		else \

processor/geoipprocessor/internal/provider/maxmindprovider/README.md

@@ -1,5 +1,7 @@
 # MaxMind GeoIP Provider
 
+> Use of MaxMind and other geolocation databases are subject to applicable licenses and terms governing the databases. Consult the database provider for the latest applicable terms.
+
 This package provides a MaxMind GeoIP provider for use with the OpenTelemetry GeoIP processor. It leverages the [geoip2-golang package](https://github.com/oschwald/geoip2-golang) to query geographical information associated with IP addresses from MaxMind databases. See recommended clients: https://dev.maxmind.com/geoip/docs/databases#api-clients
 
 # Features

receiver/jmxreceiver/supported_jars.go

@@ -31,6 +31,10 @@ func oldFormatProperties(c *Config, j supportedJar) error {
 // If you change this variable name, please open an issue in opentelemetry-java-contrib
 // so that repository's release automation can be updated
 var jmxMetricsGathererVersions = map[string]supportedJar{
+	"6c1d4c82d76f2826acf43981ef0b222f55eea841aebcc604a0daafbb2bddb93c": {
+		version: "1.43.0-alpha",
+		jar:     "JMX metrics gatherer",
+	},
 	"e19041d478c2f3641cee499bae74baa66c97c193b0012369deeb587d5add958a": {
 		version: "1.42.0-alpha",
 		jar:     "JMX metrics gatherer",

receiver/vcenterreceiver/documentation.md

@@ -802,6 +802,32 @@ The vSAN throughput of a virtual machine.
 | ---- | ----------- | ------ |
 | direction | The type of vSAN throughput. | Str: ``read``, ``write`` |
 
+## Optional Metrics
+
+The following metrics are not emitted by default. Each of them can be enabled by applying the following configuration:
+
+```yaml
+metrics:
+  <metric_name>:
+    enabled: true
+```
+
+### vcenter.host.memory.capacity
+
+Total memory  capacity of the host system.
+
+| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
+| ---- | ----------- | ---------- | ----------------------- | --------- |
+| MiBy | Sum | Double | Cumulative | false |
+
+### vcenter.vm.memory.granted
+
+The amount of memory that is granted to a VM.
+
+| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
+| ---- | ----------- | ---------- | ----------------------- | --------- |
+| MiBy | Sum | Int | Cumulative | false |
+
 ## Resource Attributes
 
 | Name | Description | Values | Enabled |