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

Sync with upstream #3

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ devfiler spins up a local server that listens on `0.0.0.0:11000`.

To run it, simply download and unpack the archive from the following URL:

https://upload.elastic.co/d/87e7697991940ec37f0c6e39ac38d213f65e8dc1ef9dbedff6aab9cba0adfaba
https://upload.elastic.co/d/f8aa0c386baa808a616ca29f86b34c726edb5af36f8840a4cf28468ad534a4b5

Authentication token: `c74dfc4db2212015`
Authentication token: `2635c0750bf8ea69`


The archive contains a build for each of the following platforms:
Expand Down
2 changes: 2 additions & 0 deletions processmanager/ebpf/ebpf.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ var outerMapsName = [...]string{
"exe_id_to_19_stack_deltas",
"exe_id_to_20_stack_deltas",
"exe_id_to_21_stack_deltas",
"exe_id_to_22_stack_deltas",
"exe_id_to_23_stack_deltas",
}

// Compile time check to make sure ebpfMapsImpl satisfies the interface .
Expand Down
11 changes: 5 additions & 6 deletions processmanager/ebpf/ebpf_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//go:build !integration
// +build !integration

// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

Expand All @@ -12,6 +9,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/ebpf-profiler/support"
)

func TestMapID(t *testing.T) {
Expand All @@ -26,18 +24,19 @@ func TestMapID(t *testing.T) {
0x3FF: 10, // 1023
0x400: 11, // 1024
0xFFFFF: 20, // 1048575 (2^20 - 1)
(1 << support.StackDeltaBucketLargest) - 1: support.StackDeltaBucketLargest,
}
for numStackDeltas, expectedShift := range testCases {
numStackDeltas := numStackDeltas
expectedShift := expectedShift
t.Run(fmt.Sprintf("deltas %d", numStackDeltas), func(t *testing.T) {
shift, err := getMapID(numStackDeltas)
require.NoError(t, err)
assert.Equal(t, expectedShift, shift,
fmt.Sprintf("wrong map name for %d deltas", numStackDeltas))
assert.Equal(t, expectedShift, shift, "wrong map name for %d deltas",
numStackDeltas)
})
}

_, err := getMapID(1 << 22)
_, err := getMapID(1 << (support.StackDeltaBucketLargest + 1))
require.Error(t, err)
}
122 changes: 0 additions & 122 deletions reporter/fifo.go

This file was deleted.

118 changes: 0 additions & 118 deletions reporter/fifo_test.go

This file was deleted.

Loading
Loading